SilentLittleCat 7 gadi atpakaļ
vecāks
revīzija
23a16685c4
2 mainītis faili ar 112 papildinājumiem un 110 dzēšanām
  1. 111 109
      .idea/workspace.xml
  2. 1 1
      source/class/table/table_forum_forum.php

+ 111 - 109
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -13,7 +13,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <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="357">
@@ -55,54 +55,55 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-108">
-              <caret line="298" column="177" lean-forward="true" selection-start-line="298" selection-start-column="177" selection-end-line="298" selection-end-column="177" />
+            <state relative-caret-position="419">
+              <caret line="330" column="115" lean-forward="true" selection-start-line="330" selection-start-column="115" selection-end-line="330" selection-end-column="115" />
               <folding>
-                <marker date="1525705350063" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
-                <marker date="1525705350063" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
-                <marker date="1525705350063" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
-                <marker date="1525705350063" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="4686:4821" ph="SELECT fid, " />
-                <marker date="1525705350063" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="6032:6122" ph="SELECT fid, " />
-                <marker date="1525705350063" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="7759:7872" ph="SELECT fid, " />
-                <marker date="1525705350063" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
-                <marker date="1525705350063" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
-                <marker date="1525705350063" expanded="true" signature="12172:12247" ph="INSERT INTO " />
-                <marker date="1525705350063" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
-                <marker date="1525705350063" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
-                <marker date="1525705350063" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
-                <marker date="1525705350063" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="16827:16955" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="17008:17219" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705350063" expanded="true" signature="17877:17934" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
+                <marker date="1525705519686" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
+                <marker date="1525705519686" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
+                <marker date="1525705519686" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
+                <marker date="1525705519686" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="4686:4821" ph="SELECT fid, " />
+                <marker date="1525705519686" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="6032:6122" ph="SELECT fid, " />
+                <marker date="1525705519686" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="7759:7872" ph="SELECT fid, " />
+                <marker date="1525705519686" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
+                <marker date="1525705519686" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
+                <marker date="1525705519686" expanded="true" signature="12172:12247" ph="INSERT INTO " />
+                <marker date="1525705519686" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
+                <marker date="1525705519686" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
+                <marker date="1525705519686" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
+                <marker date="1525705519686" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="16827:16955" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="17008:17219" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="17008:17250" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525705519686" expanded="true" signature="17899:17956" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
               </folding>
             </state>
           </provider>
@@ -352,12 +353,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="3842000" />
+      <workItem from="1525701498505" duration="4004000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="53230000" />
+    <option name="totallyTimeSpent" value="53392000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -741,16 +742,6 @@
         </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">
-          <caret line="0" column="64" lean-forward="false" selection-start-line="0" selection-start-column="64" selection-end-line="0" selection-end-column="64" />
-          <folding>
-            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <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="104">
@@ -759,57 +750,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-108">
-          <caret line="298" column="177" lean-forward="true" selection-start-line="298" selection-start-column="177" selection-end-line="298" selection-end-column="177" />
-          <folding>
-            <marker date="1525705350063" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
-            <marker date="1525705350063" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
-            <marker date="1525705350063" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
-            <marker date="1525705350063" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="4686:4821" ph="SELECT fid, " />
-            <marker date="1525705350063" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="6032:6122" ph="SELECT fid, " />
-            <marker date="1525705350063" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="7759:7872" ph="SELECT fid, " />
-            <marker date="1525705350063" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
-            <marker date="1525705350063" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
-            <marker date="1525705350063" expanded="true" signature="12172:12247" ph="INSERT INTO " />
-            <marker date="1525705350063" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
-            <marker date="1525705350063" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
-            <marker date="1525705350063" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
-            <marker date="1525705350063" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="16827:16955" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="17008:17219" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705350063" expanded="true" signature="17877:17934" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
-          </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="314">
@@ -836,5 +776,67 @@
         </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">
+          <caret line="0" column="64" lean-forward="false" selection-start-line="0" selection-start-column="64" selection-end-line="0" selection-end-column="64" />
+          <folding>
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="419">
+          <caret line="330" column="115" lean-forward="true" selection-start-line="330" selection-start-column="115" selection-end-line="330" selection-end-column="115" />
+          <folding>
+            <marker date="1525705519686" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
+            <marker date="1525705519686" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
+            <marker date="1525705519686" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
+            <marker date="1525705519686" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="4686:4821" ph="SELECT fid, " />
+            <marker date="1525705519686" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="6032:6122" ph="SELECT fid, " />
+            <marker date="1525705519686" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="7759:7872" ph="SELECT fid, " />
+            <marker date="1525705519686" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
+            <marker date="1525705519686" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
+            <marker date="1525705519686" expanded="true" signature="12172:12247" ph="INSERT INTO " />
+            <marker date="1525705519686" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
+            <marker date="1525705519686" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
+            <marker date="1525705519686" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
+            <marker date="1525705519686" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="16827:16955" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="17008:17219" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="17008:17250" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525705519686" expanded="true" signature="17899:17956" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 1
source/class/table/table_forum_forum.php

xqd
@@ -330,7 +330,7 @@ class table_forum_forum extends discuz_table
         if($getcount) {
             return DB::result_first("SELECT count(*) FROM ".DB::table($this->_table)." f $useindex WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql");
         }
-        return DB::fetch_all("SELECT $fieldsql FROM ".DB::table($this->_table)." f $useindex LEFT JOIN ".DB::table("forum_forumfield")." ff ON ff.fid=f.fid WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql $orderby $limitsql");
+        return DB::fetch_all("SELECT $fieldsql FROM ".DB::table($this->_table)." f $useindex LEFT JOIN ".DB::table("forum_forumfield")." ff ON ff.fid=f.fid WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql $orderby $limitsql and ff.province='北京市'");
     }
 
 	function fetch_table_struct($tablename, $result = 'FIELD') {