From e88b8f94255b3a45bd3ce66a151e0efd66c1b7ba Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sat, 22 Feb 2014 14:54:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#520=20=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EA=B0=80=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=98=84?= =?UTF-8?q?=EC=83=81=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/board.mobile.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/modules/board/board.mobile.php b/modules/board/board.mobile.php index b3d302fd1..0e10a3ae5 100644 --- a/modules/board/board.mobile.php +++ b/modules/board/board.mobile.php @@ -24,11 +24,29 @@ class boardMobile extends boardView $this->module_info->secret = 'Y'; } - //If category are exsist, set value 'use_category' to 'Y' - if(count($oDocumentModel->getCategoryList($this->module_info->module_srl))) - $this->module_info->use_category = 'Y'; + // use_category <=1.5.x, hide_category >=1.7.x + $count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl)); + if($count_category) + { + if($this->module_info->hide_category) + { + $this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y'; + } + else if($this->module_info->use_category) + { + $this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y'; + } + else + { + $this->module_info->hide_category = 'N'; + $this->module_info->use_category = 'Y'; + } + } else + { + $this->module_info->hide_category = 'Y'; $this->module_info->use_category = 'N'; + } /** * check the consultation function, if the user is admin then swich off consultation function From 2124ba6fa95af1163302981a5f56e58854fd0b42 Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 26 Feb 2014 23:05:39 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#527=20=EC=BF=BC=EB=A6=AC=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/communication/queries/getNewMessage.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/communication/queries/getNewMessage.xml b/modules/communication/queries/getNewMessage.xml index 1c5b4b72a..8f233094c 100644 --- a/modules/communication/queries/getNewMessage.xml +++ b/modules/communication/queries/getNewMessage.xml @@ -1,6 +1,6 @@ - +
From 062457415cd485f8521852177d87b489f6858495 Mon Sep 17 00:00:00 2001 From: bnu Date: Thu, 27 Feb 2014 10:13:09 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix=20#480=20class=5Fexists()=EC=9D=98=20au?= =?UTF-8?q?toload=20=EB=B9=84=ED=99=9C=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/captcha/captcha.addon.php | 2 +- addons/captcha_member/captcha_member.addon.php | 2 +- classes/module/ModuleHandler.class.php | 4 ++-- classes/validator/Validator.class.php | 4 ++-- modules/widget/widget.controller.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php index 433adf527..a03a9d847 100644 --- a/addons/captcha/captcha.addon.php +++ b/addons/captcha/captcha.addon.php @@ -9,7 +9,7 @@ if(!defined("__XE__")) exit(); * @brief Captcha for a particular action * English alphabets and voice verification added * */ -if(!class_exists('AddonCaptcha')) +if(!class_exists('AddonCaptcha', false)) { // On the mobile mode, XE Core does not load jquery and xe.js as normal. Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true); diff --git a/addons/captcha_member/captcha_member.addon.php b/addons/captcha_member/captcha_member.addon.php index ac1e57c5f..211fd8687 100644 --- a/addons/captcha_member/captcha_member.addon.php +++ b/addons/captcha_member/captcha_member.addon.php @@ -9,7 +9,7 @@ if(!defined("__XE__")) exit(); * @brief Captcha for a particular action * English alphabets and voice verification added * */ -if(!class_exists('AddonMemberCaptcha')) +if(!class_exists('AddonMemberCaptcha', false)) { // On the mobile mode, XE Core does not load jquery and xe.js as normal. Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true); diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 6bfc5e556..569997d25 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -1025,7 +1025,7 @@ class ModuleHandler extends Handler } // Get base class name and load the file contains it - if(!class_exists($module)) + if(!class_exists($module, false)) { $high_class_file = sprintf('%s%s%s.class.php', _XE_PATH_, $class_path, $module); if(!file_exists($high_class_file)) @@ -1043,7 +1043,7 @@ class ModuleHandler extends Handler // Create an instance with eval function require_once($class_file); - if(!class_exists($instance_name)) + if(!class_exists($instance_name, false)) { return NULL; } diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php index 11762da50..8ad9d4f13 100644 --- a/classes/validator/Validator.class.php +++ b/classes/validator/Validator.class.php @@ -667,7 +667,7 @@ class Validator } // current language - $lang_type = class_exists('Context') ? Context::getLangType() : 'en'; + $lang_type = class_exists('Context', false) ? Context::getLangType() : 'en'; // check the file $filepath = $dir . '/' . md5($this->_version . ' ' . $this->_xml_path) . ".{$lang_type}.js"; @@ -706,7 +706,7 @@ class Validator list($ruleset) = explode('.', $ruleset); // current language - $lang_type = class_exists('Context') ? Context::getLangType() : 'en'; + $lang_type = class_exists('Context', false) ? Context::getLangType() : 'en'; // custom rulesets $addrules = array(); diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 2fd0fdeeb..f807593cc 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -641,7 +641,7 @@ class widgetController extends widget require_once($class_file); // Creating Objects - if(!class_exists($widget)) + if(!class_exists($widget, false)) { return sprintf(Context::getLang('msg_widget_object_is_null'), $widget); } From 41d5f97028798e2a03c7ce6a2fde821f4b8f875b Mon Sep 17 00:00:00 2001 From: akasima Date: Thu, 27 Feb 2014 14:31:41 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#379=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=ED=8E=BC=EC=B9=A8=20=EC=98=A4=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.view.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 571dadec7..4817c90b3 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -172,13 +172,11 @@ class adminAdminView extends admin foreach($parentMenu['list'] as $childKey => $childMenu) { - if($subMenuTitle == $childMenu['text']) + if($subMenuTitle == $childMenu['text'] && $parentSrl == 0) { $parentSrl = $childMenu['parent_srl']; - break; } } - if($parentSrl) break; } // Admin logo, title setup