tset

.idea/workspace.xml

@@ -16,8 +16,8 @@
       <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="530" column="52" lean-forward="true" selection-start-line="530" selection-start-column="52" selection-end-line="530" selection-end-column="52" />
+            <state relative-caret-position="632">
+              <caret line="490" column="20" lean-forward="true" selection-start-line="490" selection-start-column="20" selection-end-line="490" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -89,8 +89,8 @@
       <find>管理</find>
       <find>俱乐部名称</find>
       <find>名称</find>
-      <find>upload_icon_banner</find>
       <find>加入方式</find>
+      <find>upload_icon_banner</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -245,12 +245,12 @@
       <workItem from="1525658293907" duration="23514000" />
       <workItem from="1525701498505" duration="7843000" />
       <workItem from="1525738524458" duration="1328000" />
-      <workItem from="1525788960861" duration="7335000" />
+      <workItem from="1525788960861" duration="7556000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="65894000" />
+    <option name="totallyTimeSpent" value="66115000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -695,8 +695,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="530" column="52" lean-forward="true" selection-start-line="530" selection-start-column="52" selection-end-line="530" selection-end-column="52" />
+        <state relative-caret-position="632">
+          <caret line="490" column="20" lean-forward="true" selection-start-line="490" selection-start-column="20" selection-end-line="490" selection-end-column="20" />
           <folding />
         </state>
       </provider>

source/module/forum/forum_group.php

@@ -475,19 +475,19 @@ if($action == 'index') {
 			$bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
 
 			if($_FILES['nav_image_1']) {
-			    $nav_image_1 = upload_icon_banner($sg_data, $_FILES['nav_image_1'], 'carousel_1');
+			    $nav_image_1 = upload_icon_banner($_G['forum'], $_FILES['nav_image_1'], 'carousel_1');
             } else {
                 $nav_image_1 = $_GET['nav_image_1_old'];
             }
 
             if($_FILES['nav_image_2']) {
-                $nav_image_2 = upload_icon_banner($sg_data, $_FILES['nav_image_2'], 'carousel_2');
+                $nav_image_2 = upload_icon_banner($_G['forum'], $_FILES['nav_image_2'], 'carousel_2');
             } else {
                 $nav_image_2 = $_GET['nav_image_2_old'];
             }
 
             if($_FILES['nav_image_3']) {
-                $nav_image_3 = upload_icon_banner($sg_data, $_FILES['nav_image_3'], 'carousel_3');
+                $nav_image_3 = upload_icon_banner($_G['forum'], $_FILES['nav_image_3'], 'carousel_3');
             } else {
                 $nav_image_3 = $_GET['nav_image_3_old'];
             }