merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -6,9 +6,9 @@
<action name="dispRssAdminIndex" type="view" index="true" standalone="true" admin_index="true" menu_name="rss" menu_index="true" />
<action name="rss" type="view" standalone="true" />
<action name="atom" type="view" standalone="true" />
<action name="procRssAdminToggleActivate" type="controller" standalone="true" />
<action name="procRssAdminInsertConfig" type="controller" standalone="true" ruleset="insertRssConfig" />
<action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" ruleset="insertRssModuleConfig" />
<action name="procRssAdminDeleteFeedImage" type="controller" standalone="true" />
<action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" />
</actions>
<menus>
<menu name="rss">