merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -1,13 +1,15 @@
<?php
/**
* @class rssAdminView
* @author misol (misol@korea.ac.kr)
* @brief The admin view class of the rss module
* The admin view class of the rss module
*
* @author NHN (developers@xpressengine.com)
**/
class rssAdminView extends rss {
/**
* @brief Initialization
* Initialization
*
* @return void
**/
function init() {
//Set template path
@ -16,7 +18,9 @@
/**
* @brief In case an administrator page has been initialized
* In case an administrator page has been initialized
*
* @return Object
**/
function dispRssAdminIndex() {
$oModuleModel = &getModel('module');
@ -53,4 +57,4 @@
$this->setTemplateFile('rss_admin_index');
}
}
?>
?>