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

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
akasima 2014-01-21 15:35:58 +09:00
commit c3daf779d7
2 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/board/board.view.php
View file

@ -47,16 +47,27 @@ class boardView extends board
}
// use_category <=1.5.x, hide_category >=1.7.x
$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));
if($count_category && ($this->module_info->hide_category != 'Y' || $this->module_info->use_category != 'N'))
$count_category = count($oDocumentModel->getCategoryList($module_srl));
if($count_category)
{
$this->module_info->hide_category = 'N';
$this->module_info->use_category = 'Y';
if($config->hide_category)
{
$config->use_category = ($config->hide_category == 'Y') ? 'N' : 'Y';
}
else if($config->use_category)
{
$config->hide_category = ($config->use_category == 'Y') ? 'N' : 'Y';
}
else
{
$config->hide_category = 'N';
$config->use_category = 'Y';
}
}
else
{
$this->module_info->hide_category = 'Y';
$this->module_info->use_category = 'N';
$config->hide_category = 'Y';
$config->use_category = 'N';
}
/**
@ -403,7 +414,7 @@ class boardView extends board
// set the current page of documents
$document_srl = Context::get('document_srl');
if(!$args->page && ($document_srl))
if(!$args->page && $document_srl)
{
$oDocument = $oDocumentModel->getDocument($document_srl);
if($oDocument->isExists() && !$oDocument->isNotice())