SilentLittleCat пре 7 година
родитељ
комит
c9fa0815ab
3 измењених фајлова са 48 додато и 23 уклоњено
  1. 46 21
      .idea/workspace.xml
  2. 1 1
      group.php
  3. 1 1
      source/module/group/group_index.php

+ 46 - 21
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/group.php" afterPath="$PROJECT_DIR$/group.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" />
@@ -23,16 +24,39 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="527">
-              <caret line="146" column="44" lean-forward="false" selection-start-line="146" selection-start-column="44" selection-end-line="146" selection-end-column="44" />
+              <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="group.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/group.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="620">
+              <caret line="28" column="44" lean-forward="false" selection-start-line="28" selection-start-column="44" selection-end-line="28" selection-end-column="44" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1369">
+              <caret line="1134" column="9" lean-forward="false" selection-start-line="1134" selection-start-column="9" selection-end-line="1134" selection-end-column="9" />
+              <folding>
+                <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
+                <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -61,6 +85,7 @@
         <option value="$PROJECT_DIR$/forum.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
+        <option value="$PROJECT_DIR$/group.php" />
       </list>
     </option>
   </component>
@@ -157,12 +182,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="541000" />
+      <workItem from="1525227575525" duration="662000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5371000" />
+    <option name="totallyTimeSpent" value="5492000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -271,17 +296,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="-244">
-          <caret line="425" column="9" lean-forward="false" selection-start-line="425" selection-start-column="9" selection-end-line="425" selection-end-column="9" />
-          <folding>
-            <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
-            <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/forum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="663">
@@ -317,10 +331,21 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/group.php">
+    <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="20" column="29" lean-forward="true" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" />
+        <state relative-caret-position="-1369">
+          <caret line="1134" column="9" lean-forward="false" selection-start-line="1134" selection-start-column="9" selection-end-line="1134" selection-end-column="9" />
+          <folding>
+            <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
+            <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
+          </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="527">
+          <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -333,10 +358,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
+    <entry file="file://$PROJECT_DIR$/group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="146" column="44" lean-forward="false" selection-start-line="146" selection-start-column="44" selection-end-line="146" selection-end-column="44" />
+        <state relative-caret-position="620">
+          <caret line="28" column="44" lean-forward="false" selection-start-line="28" selection-start-column="44" selection-end-line="28" selection-end-column="44" />
           <folding />
         </state>
       </provider>

+ 1 - 1
group.php

xqd
@@ -26,7 +26,7 @@ $mod = !in_array($_G['mod'], $modarray) ? 'index' : $_G['mod'];
 define('CURMODULE', $mod);
 
 runhooks();
-
+var_dump($_G['setting']['group_recommend']);
 $navtitle = str_replace('{bbname}', $_G['setting']['bbname'], $_G['setting']['seotitle']['group']);
 
 require DISCUZ_ROOT.'./source/module/group/group_'.$mod.'.php';

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

xqd
@@ -144,7 +144,7 @@ if(!$metakeywords) {
 if(!$metadescription) {
 	$metadescription = $_G['setting']['navs'][3]['navname'];
 }
-var_dump($_G['setting']['group_recommend']);
+
 if(empty($curtype)) {
 	include template('diy:group/index');
 } else {