|
@@ -2,7 +2,6 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
<change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -37,19 +36,23 @@
|
|
<file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
|
|
<file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="434">
|
|
|
|
- <caret line="86" column="17" lean-forward="false" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
|
|
|
|
|
|
+ <state relative-caret-position="503">
|
|
|
|
+ <caret line="345" column="320" lean-forward="false" selection-start-line="345" selection-start-column="320" selection-end-line="345" selection-end-column="320" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
|
|
|
+ <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="217">
|
|
|
|
- <caret line="7" column="41" lean-forward="false" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
|
|
|
|
- <folding />
|
|
|
|
|
|
+ <state relative-caret-position="314">
|
|
|
|
+ <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
|
|
|
|
+ <folding>
|
|
|
|
+ <marker date="1523670581543" expanded="true" signature="5361:5369" ph="›" />
|
|
|
|
+ <marker date="1523670581543" expanded="true" signature="5493:5501" ph="›" />
|
|
|
|
+ <marker date="1523670581543" expanded="true" signature="5780:5788" ph="›" />
|
|
|
|
+ </folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -57,8 +60,8 @@
|
|
<file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
|
|
<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">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="2914">
|
|
|
|
- <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
|
|
|
|
|
|
+ <state relative-caret-position="-2108">
|
|
|
|
+ <caret line="709" column="70" lean-forward="false" selection-start-line="709" selection-start-column="64" selection-end-line="709" selection-end-column="70" />
|
|
<folding>
|
|
<folding>
|
|
<marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
|
|
<marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
|
|
</folding>
|
|
</folding>
|
|
@@ -80,6 +83,7 @@
|
|
<find>group_recommend</find>
|
|
<find>group_recommend</find>
|
|
<find>create</find>
|
|
<find>create</find>
|
|
<find>$parentid</find>
|
|
<find>$parentid</find>
|
|
|
|
+ <find>print_r</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -193,12 +197,12 @@
|
|
<workItem from="1525013350506" duration="115000" />
|
|
<workItem from="1525013350506" duration="115000" />
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
<workItem from="1525181078381" duration="610000" />
|
|
<workItem from="1525181078381" duration="610000" />
|
|
- <workItem from="1525227575525" duration="3329000" />
|
|
|
|
|
|
+ <workItem from="1525227575525" duration="3992000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="8159000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="8822000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
@@ -388,10 +392,22 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="314">
|
|
|
|
+ <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
|
|
|
|
+ <folding>
|
|
|
|
+ <marker date="1523670581543" expanded="true" signature="5361:5369" ph="›" />
|
|
|
|
+ <marker date="1523670581543" expanded="true" signature="5493:5501" ph="›" />
|
|
|
|
+ <marker date="1523670581543" expanded="true" signature="5780:5788" ph="›" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="2914">
|
|
|
|
- <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
|
|
|
|
|
|
+ <state relative-caret-position="-2108">
|
|
|
|
+ <caret line="709" column="70" lean-forward="false" selection-start-line="709" selection-start-column="64" selection-end-line="709" selection-end-column="70" />
|
|
<folding>
|
|
<folding>
|
|
<marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
|
|
<marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
|
|
</folding>
|
|
</folding>
|
|
@@ -400,8 +416,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="434">
|
|
|
|
- <caret line="86" column="17" lean-forward="false" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
|
|
|
|
|
|
+ <state relative-caret-position="503">
|
|
|
|
+ <caret line="345" column="320" lean-forward="false" selection-start-line="345" selection-start-column="320" selection-end-line="345" selection-end-column="320" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|