SilentLittleCat 7 rokov pred
rodič
commit
47c11a66bb

+ 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="431">
-              <caret line="193" column="60" lean-forward="false" selection-start-line="193" selection-start-column="60" selection-end-line="193" selection-end-column="60" />
+            <state relative-caret-position="338">
+              <caret line="190" column="0" lean-forward="true" selection-start-line="190" selection-start-column="0" selection-end-line="190" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -309,12 +309,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="5452000" />
+      <workItem from="1525701498505" duration="5477000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="54840000" />
+    <option name="totallyTimeSpent" value="54865000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -791,8 +791,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="431">
-          <caret line="193" column="60" lean-forward="false" selection-start-line="193" selection-start-column="60" selection-end-line="193" selection-end-column="60" />
+        <state relative-caret-position="338">
+          <caret line="190" column="0" lean-forward="true" selection-start-line="190" selection-start-column="0" selection-end-line="190" selection-end-column="0" />
           <folding />
         </state>
       </provider>

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

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