SilentLittleCat 7 years ago
parent
commit
9a3256c3da
2 changed files with 24 additions and 24 deletions
  1. 21 21
      .idea/workspace.xml
  2. 3 3
      source/module/forum/forum_group.php

+ 21 - 21
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -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="229">
-              <caret line="465" column="30" lean-forward="true" selection-start-line="465" selection-start-column="30" selection-end-line="465" selection-end-column="30" />
+            <state relative-caret-position="353">
+              <caret line="351" column="33" lean-forward="true" selection-start-line="351" selection-start-column="33" selection-end-line="351" selection-end-column="33" />
               <folding />
             </state>
           </provider>
@@ -39,8 +39,8 @@
       <file leaf-file-name="function_forum.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="712" column="67" lean-forward="true" selection-start-line="712" selection-start-column="31" selection-end-line="712" selection-end-column="67" />
+            <state relative-caret-position="26">
+              <caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
               <folding>
                 <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -313,12 +313,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="461000" />
+      <workItem from="1525658293907" duration="558000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26335000" />
+    <option name="totallyTimeSpent" value="26432000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -738,17 +738,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
-          <folding>
-            <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
-            <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="31">
@@ -759,8 +748,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="712" column="67" lean-forward="true" selection-start-line="712" selection-start-column="31" selection-end-line="712" selection-end-column="67" />
+        <state relative-caret-position="26">
+          <caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
           <folding>
             <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -796,10 +785,21 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="124">
+          <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
+          <folding>
+            <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
+            <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="465" column="30" lean-forward="true" selection-start-line="465" selection-start-column="30" selection-end-line="465" selection-end-column="30" />
+        <state relative-caret-position="353">
+          <caret line="351" column="33" lean-forward="true" selection-start-line="351" selection-start-column="33" selection-end-line="351" selection-end-column="33" />
           <folding />
         </state>
       </provider>

+ 3 - 3
source/module/forum/forum_group.php

xqd xqd
@@ -347,6 +347,8 @@ if($action == 'index') {
 			$gviewperm = intval($_GET['gviewperm']);
 
 			$sg_data['fid'] = $newfid;
+			$sg_data['status'] = 3;
+            $_G['setting']['group_imgsizelimit'] = 512;
             $iconnew = upload_icon_banner($sg_data, $_FILES['iconnew'], 'icon');
             $bannernew = upload_icon_banner($sg_data, $_FILES['bannernew'], 'banner');
             if($iconnew) {
@@ -465,9 +467,7 @@ if($action == 'index') {
 
 			$setarr = array();
 			$deletebanner = $_GET['deletebanner'];
-			print_r($_G['forum']['status']);
-			print_r($_G['setting']['group_imgsizelimit']);
-			exit();
+
 			$iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
 			$bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
 			if($iconnew) {