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,16 +1,18 @@
<?php
/**
* @class rssModel
* The model class of the rss module
*
* @author NHN (developers@xpressengine.com)
* @brief The model class of the rss module
*
* Feed the document output
*
**/
class rssModel extends rss {
/**
* @brief Create the Feed url.
* Create the Feed url.
*
* @param string $vid Vid
* @param string $mid mid
* @param string $format Feed format. ef)xe, atom, rss1.0
* @return string
**/
function getModuleFeedUrl($vid = null, $mid, $format) {
if(Context::isAllowRewrite()) {
@ -30,7 +32,10 @@
/**
* @brief Return the RSS configurations of the specific modules
* Return the RSS configurations of the specific modules
*
* @param integer $module_srl Module_srl
* @return Object
**/
function getRssModuleConfig($module_srl) {
// Get the configurations of the rss module