test

.idea/workspace.xml

@@ -2,7 +2,7 @@
 <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_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,11 +33,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
+      <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="477">
-              <caret line="190" column="34" lean-forward="false" selection-start-line="190" selection-start-column="34" selection-end-line="190" selection-end-column="34" />
+            <state relative-caret-position="508">
+              <caret line="191" column="51" lean-forward="false" selection-start-line="191" selection-start-column="51" selection-end-line="191" selection-end-column="51" />
               <folding />
             </state>
           </provider>
@@ -57,11 +57,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
         <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="109">
-              <caret line="1386" column="25" lean-forward="true" selection-start-line="1386" selection-start-column="25" selection-end-line="1386" selection-end-column="25" />
+            <state relative-caret-position="233">
+              <caret line="1358" column="77" lean-forward="false" selection-start-line="1358" selection-start-column="39" selection-end-line="1358" selection-end-column="77" />
               <folding>
                 <marker date="1525270666326" expanded="true" signature="18737:18749" ph="..." />
               </folding>
@@ -104,8 +104,8 @@
         <option value="$PROJECT_DIR$/group.php" />
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
-        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       </list>
     </option>
   </component>
@@ -202,12 +202,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="6581000" />
+      <workItem from="1525227575525" duration="6786000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11411000" />
+    <option name="totallyTimeSpent" value="11616000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -381,26 +381,6 @@
         </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="477">
-          <caret line="190" column="34" lean-forward="false" selection-start-line="190" selection-start-column="34" selection-end-line="190" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="584">
-          <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
-          <folding>
-            <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
-            <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
-            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
-          </folding>
-        </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="2480">
@@ -419,13 +399,33 @@
     </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="109">
-          <caret line="1386" column="25" lean-forward="true" selection-start-line="1386" selection-start-column="25" selection-end-line="1386" selection-end-column="25" />
+        <state relative-caret-position="233">
+          <caret line="1358" column="77" lean-forward="false" selection-start-line="1358" selection-start-column="39" selection-end-line="1358" selection-end-column="77" />
           <folding>
             <marker date="1525270666326" expanded="true" signature="18737:18749" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="584">
+          <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
+          <folding>
+            <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
+            <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
+            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
+          </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="508">
+          <caret line="191" column="51" lean-forward="false" selection-start-line="191" selection-start-column="51" selection-end-line="191" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

source/module/forum/forum_group.php

@@ -189,6 +189,7 @@ if($action == 'index') {
 	}
 
 	write_groupviewed($_G['fid']);
+    $_G['setting']['navs']['3']['navname'] = '俱乐部';
 	include template('diy:group/group:'.$_G['fid']);
 
 } elseif($action == 'memberlist') {