From e4077ad324e959a413fed2a4c672043215a840f2 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 26 Feb 2016 09:20:35 +0900 Subject: [PATCH] Add 'smartphone' add-on to common blacklist --- common/defaults/blacklist.php | 1 + modules/addon/addon.controller.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/defaults/blacklist.php b/common/defaults/blacklist.php index ce91d5571..bcbe7904f 100644 --- a/common/defaults/blacklist.php +++ b/common/defaults/blacklist.php @@ -7,5 +7,6 @@ */ return array( 'member_communication' => true, + 'smartphone' => true, 'zipperupper' => true, ); diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 2fd699187..3eceacc89 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -1,4 +1,4 @@ - */ /** @@ -84,7 +84,7 @@ class addonController extends addon $addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype); foreach($addon_list as $addon => $val) { - if($val->addon == "smartphone" || Context::isBlacklistedPlugin($addon) + if(Context::isBlacklistedPlugin($addon) || ($type == "pc" && $val->is_used != 'Y') || ($type == "mobile" && $val->is_used_m != 'Y') || ($gtype == 'global' && $val->is_fixed != 'Y')