SilentLittleCat 7 년 전
부모
커밋
807a14554c
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 6 6
      .idea/workspace.xml
  2. 1 1
      source/module/forum/forum_group.php

+ 6 - 6
.idea/workspace.xml

xqd xqd xqd
@@ -36,8 +36,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="658">
-              <caret line="319" column="0" lean-forward="false" selection-start-line="319" selection-start-column="2" selection-end-line="322" selection-end-column="9" />
+            <state relative-caret-position="503">
+              <caret line="317" column="48" lean-forward="true" selection-start-line="317" selection-start-column="12" selection-end-line="317" selection-end-column="48" />
               <folding />
             </state>
           </provider>
@@ -197,12 +197,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="4472000" />
+      <workItem from="1525227575525" duration="4577000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9302000" />
+    <option name="totallyTimeSpent" value="9407000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -416,8 +416,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="658">
-          <caret line="319" column="0" lean-forward="false" selection-start-line="319" selection-start-column="2" selection-end-line="322" selection-end-column="9" />
+        <state relative-caret-position="503">
+          <caret line="317" column="48" lean-forward="true" selection-start-line="317" selection-start-column="12" selection-end-line="317" selection-end-column="48" />
           <folding />
         </state>
       </provider>

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

xqd
@@ -315,7 +315,7 @@ if($action == 'index') {
 		} elseif($censormod) {
 			showmessage('group_name_failed');
 		} elseif(empty($parentid) && empty($fup)) {
-			showmessage('group_category_empty');
+//			showmessage('group_category_empty');
 		}
 //		if(empty($_G['cache']['grouptype']['first'][$parentid]) && empty($_G['cache']['grouptype']['second'][$fup])
 //			|| $_G['cache']['grouptype']['first'][$parentid]['secondlist'] &&  !in_array($_G['cache']['grouptype']['second'][$fup]['fid'], $_G['cache']['grouptype']['first'][$parentid]['secondlist'])) {