tst

.idea/workspace.xml

@@ -13,11 +13,11 @@
   </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="450">
-              <caret line="151" column="41" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="41" />
+            <state relative-caret-position="357">
+              <caret line="148" column="35" lean-forward="true" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
               <folding />
             </state>
           </provider>
@@ -55,54 +55,54 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="667">
-              <caret line="336" column="156" lean-forward="true" selection-start-line="336" selection-start-column="156" selection-end-line="336" selection-end-column="156" />
+            <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="1525705288609" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
-                <marker date="1525705288609" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
-                <marker date="1525705288609" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
-                <marker date="1525705288609" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="4686:4821" ph="SELECT fid, " />
-                <marker date="1525705288609" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="6032:6122" ph="SELECT fid, " />
-                <marker date="1525705288609" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="7759:7872" ph="SELECT fid, " />
-                <marker date="1525705288609" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
-                <marker date="1525705288609" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
-                <marker date="1525705288609" expanded="true" signature="12172:12247" ph="INSERT INTO " />
-                <marker date="1525705288609" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
-                <marker date="1525705288609" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
-                <marker date="1525705288609" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
-                <marker date="1525705288609" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="16980:17108" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="17161:17372" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525705288609" expanded="true" signature="18030:18087" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
+                <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>
@@ -352,12 +352,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="3776000" />
+      <workItem from="1525701498505" duration="3842000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="53164000" />
+    <option name="totallyTimeSpent" value="53230000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -751,14 +751,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="586">
-          <caret line="476" column="71" lean-forward="false" selection-start-line="476" selection-start-column="59" selection-end-line="476" selection-end-column="71" />
-          <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">
@@ -767,11 +759,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
+    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="151" column="41" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="41" />
-          <folding />
+        <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>
@@ -785,54 +820,19 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="667">
-          <caret line="336" column="156" lean-forward="true" selection-start-line="336" selection-start-column="156" selection-end-line="336" selection-end-column="156" />
-          <folding>
-            <marker date="1525705288609" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
-            <marker date="1525705288609" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
-            <marker date="1525705288609" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
-            <marker date="1525705288609" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="4686:4821" ph="SELECT fid, " />
-            <marker date="1525705288609" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="6032:6122" ph="SELECT fid, " />
-            <marker date="1525705288609" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="7759:7872" ph="SELECT fid, " />
-            <marker date="1525705288609" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
-            <marker date="1525705288609" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
-            <marker date="1525705288609" expanded="true" signature="12172:12247" ph="INSERT INTO " />
-            <marker date="1525705288609" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
-            <marker date="1525705288609" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
-            <marker date="1525705288609" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
-            <marker date="1525705288609" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="16980:17108" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="17161:17372" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525705288609" expanded="true" signature="18030:18087" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
-          </folding>
+        <state relative-caret-position="586">
+          <caret line="476" column="71" lean-forward="false" selection-start-line="476" selection-start-column="59" selection-end-line="476" selection-end-column="71" />
+          <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="357">
+          <caret line="148" column="35" lean-forward="true" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
+          <folding />
         </state>
       </provider>
     </entry>

source/class/table/table_forum_forum.php

@@ -326,13 +326,7 @@ class table_forum_forum extends discuz_table
             $levelsql = " AND f.level>'-1'";
         }
 
-        if($province == null) {
-            $province_sql = '';
-        } else {
-            $province_sql = " AND ff.province='$province'";
-        }
-
-        $fieldsql = $fieldadd.' f.fid, f.name, f.threads, f.posts, f.todayposts, f.level, as flevel ';
+        $fieldsql = $fieldadd.' f.fid, f.name, f.threads, f.posts, f.todayposts, f.level as flevel ';
         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");
         }