fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

전문 공개 (태그 포함) 설정이 무시되는 문제 수정

Browse source 
https://xetown.com/qna/988576
This commit is contained in:
conory 2018-06-04 23:33:13 +09:00
parent 7b8bea5923
commit 420e4eb536
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/rss/rss.view.php
View file

@ -52,8 +52,9 @@ class rssView extends rss
$start = $obj->start_date ?: Context::get('start_date'); $start = $obj->start_date ?: Context::get('start_date');
$end = $obj->end_date ?: Context::get('end_date'); $end = $obj->end_date ?: Context::get('end_date');
$site_module_srl = Context::get('site_module_info')->module_srl; $site_module_srl = Context::get('site_module_info')->module_srl;
$target_module_srl = $obj->module_srl ?: (Context::get('current_module_info')->module_srl ?: $site_module_srl); $current_module_srl = Context::get('current_module_info')->module_srl;
$is_part_feed = ($obj->module_srl || $target_module_srl !== $site_module_srl) ? true : false; $target_module_srl = isset($obj->module_srl) ? $obj->module_srl : ($current_module_srl ?: $site_module_srl);
$is_part_feed = (isset($obj->module_srl) || $target_module_srl !== $site_module_srl) ? true : false;
// Set format // Set format
switch($format) switch($format)
@ -109,17 +110,16 @@ class rssView extends rss
$target_modules[$module_config->module_srl] = $module_config->open_rss; $target_modules[$module_config->module_srl] = $module_config->open_rss;
} }
} }
else // total feed
elseif($config->use_total_feed == 'Y')
{ {
if($config->use_total_feed == 'Y') foreach(getModel('module')->getModulePartConfigs('rss') as $module_srl => $part_config)
{ {
foreach(getModel('module')->getModulePartConfigs('rss') as $module_srl => $part_config) if($part_config->open_rss == 'N' || $part_config->open_total_feed == 'T_N')
{ {
if($part_config->open_rss != 'N' && $part_config->open_total_feed != 'T_N') continue;
{
$target_modules[$module_srl] = $part_config->open_rss;
}
} }
$target_modules[$module_srl] = $part_config->open_rss;
} }
} }
Context::set('target_modules', $target_modules); Context::set('target_modules', $target_modules);
@ -139,7 +139,7 @@ class rssView extends rss
$args->search_target = 'is_secret'; $args->search_target = 'is_secret';
$args->search_keyword = 'N'; $args->search_keyword = 'N';
$args->page = $page > 0 ? $page : 1; $args->page = $page > 0 ? $page : 1;
$args->module_srl = implode(',', array_keys($target_modules)); $args->module_srl = array_keys($target_modules);
$args->list_count = $config->feed_document_count; $args->list_count = $config->feed_document_count;
$args->sort_index = 'regdate'; $args->sort_index = 'regdate';
$args->order_type = 'desc'; $args->order_type = 'desc';

2
modules/rss/tpl/format/rss20.html
View file

@ -19,7 +19,7 @@
<item loop="$document_list=>$oDocument"> <item loop="$document_list=>$oDocument">
<title>{$oDocument->getTitleText()}</title> <title>{$oDocument->getTitleText()}</title>
<link>{$oDocument->getPermanentUrl()}</link> <link>{$oDocument->getPermanentUrl()}</link>
<!--@if($target_modules[$oDocument->get('module_srl')]->open_rss == 'Y')--> <!--@if($target_modules[$oDocument->get('module_srl')] == 'Y')-->
<description>{utf8_trim(utf8_normalize_spaces($oDocument->get('content')))|escape}</description> <description>{utf8_trim(utf8_normalize_spaces($oDocument->get('content')))|escape}</description>
<!--@else--> <!--@else-->
<description>{$oDocument->getSummary(400)|escape}</description> <description>{$oDocument->getSummary(400)|escape}</description>

2
modules/rss/tpl/format/xe.html
View file

@ -14,7 +14,7 @@
<title>{$oDocument->getTitleText()}</title> <title>{$oDocument->getTitleText()}</title>
<author>{$oDocument->getNickName()}</author> <author>{$oDocument->getNickName()}</author>
<link>{$oDocument->getPermanentUrl()}</link> <link>{$oDocument->getPermanentUrl()}</link>
<!--@if($target_modules[$oDocument->get('module_srl')]->open_rss == 'Y')--> <!--@if($target_modules[$oDocument->get('module_srl')] == 'Y')-->
<description>{utf8_trim(utf8_normalize_spaces($oDocument->get('content')))|escape}</description> <description>{utf8_trim(utf8_normalize_spaces($oDocument->get('content')))|escape}</description>
<!--@else--> <!--@else-->
<description>{$oDocument->getSummary(400)|escape}</description> <description>{$oDocument->getSummary(400)|escape}</description>