SilentLittleCat 7 年之前
父節點
當前提交
caabe998b0
共有 2 個文件被更改,包括 16 次插入16 次删除
  1. 15 16
      .idea/workspace.xml
  2. 1 0
      source/module/group/group_index.php

+ 15 - 16
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
       <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,17 +13,17 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="326">
-              <caret line="149" column="104" lean-forward="true" selection-start-line="149" selection-start-column="104" selection-end-line="149" selection-end-column="104" />
+            <state relative-caret-position="450">
+              <caret line="150" column="104" lean-forward="true" selection-start-line="150" selection-start-column="104" selection-end-line="150" selection-end-column="104" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_area.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_diy_group_area.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="403">
@@ -219,8 +218,8 @@
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forumfield.php" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forum.php" />
-        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
+        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
       </list>
     </option>
   </component>
@@ -335,12 +334,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="1778000" />
+      <workItem from="1525701498505" duration="1870000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="51166000" />
+    <option name="totallyTimeSpent" value="51258000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -731,14 +730,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="149" column="104" lean-forward="true" selection-start-line="149" selection-start-column="104" selection-end-line="149" selection-end-column="104" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -810,5 +801,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="150" column="104" lean-forward="true" selection-start-line="150" selection-start-column="104" selection-end-line="150" selection-end-column="104" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 0
source/module/group/group_index.php

xqd
@@ -147,6 +147,7 @@ if(!$metadescription) {
 
 if(empty($curtype)) {
     if(!empty($_GET['province'])) {
+        $_G['sg'] = [];
         $_G['sg']['group_list'] = C::t('forum_forum')->fetch_all_for_grouplist('displayorder', '*', 10);
         include template('diy:group/area');
     } else {