|
@@ -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" />
|
|
@@ -17,8 +16,8 @@
|
|
<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="322">
|
|
|
|
- <caret line="468" column="19" lean-forward="false" selection-start-line="468" selection-start-column="19" selection-end-line="468" selection-end-column="19" />
|
|
|
|
|
|
+ <state relative-caret-position="229">
|
|
|
|
+ <caret line="465" column="30" lean-forward="true" selection-start-line="465" selection-start-column="30" selection-end-line="465" selection-end-column="30" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -81,7 +80,7 @@
|
|
<file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
|
|
<entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="651">
|
|
|
|
|
|
+ <state relative-caret-position="31">
|
|
<caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
|
|
<caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
@@ -314,12 +313,12 @@
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
<workItem from="1525275777043" duration="4000" />
|
|
<workItem from="1525275777043" duration="4000" />
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
- <workItem from="1525658293907" duration="147000" />
|
|
|
|
|
|
+ <workItem from="1525658293907" duration="461000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="26021000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="26335000" />
|
|
</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" />
|
|
@@ -739,14 +738,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="651">
|
|
|
|
- <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="124">
|
|
<state relative-caret-position="124">
|
|
@@ -758,6 +749,14 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="31">
|
|
|
|
+ <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="243">
|
|
<state relative-caret-position="243">
|
|
@@ -799,8 +798,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="322">
|
|
|
|
- <caret line="468" column="19" lean-forward="false" selection-start-line="468" selection-start-column="19" selection-end-line="468" selection-end-column="19" />
|
|
|
|
|
|
+ <state relative-caret-position="229">
|
|
|
|
+ <caret line="465" column="30" lean-forward="true" selection-start-line="465" selection-start-column="30" selection-end-line="465" selection-end-column="30" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|