From a3d2682744364f22d8551607d64b062626ade5a7 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 22 Jan 2021 01:24:26 +0900 Subject: [PATCH] Enable photoswipe addon by default, both on PC and mobile --- modules/addon/addon.admin.controller.php | 11 ++++++++++- modules/addon/addon.class.php | 5 +++-- modules/addon/queries/insertAddon.xml | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php index b612a040b..e649645eb 100644 --- a/modules/addon/addon.admin.controller.php +++ b/modules/addon/addon.admin.controller.php @@ -236,7 +236,16 @@ class addonAdminController extends addonController { $args = new stdClass; $args->addon = $addon; - $args->is_used = $isUsed; + if (strlen($isUsed) == 2) + { + $args->is_used = substr($isUsed, 0, 1) === 'Y' ? 'Y' : 'N'; + $args->is_used_m = substr($isUsed, 1, 1) === 'Y' ? 'Y' : 'N'; + } + else + { + $args->is_used = $isUsed === 'Y' ? 'Y' : 'N'; + } + if($gtype == 'global') { $output = executeQuery('addon.insertAddon', $args); diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php index 696dd0643..a532e5fac 100644 --- a/modules/addon/addon.class.php +++ b/modules/addon/addon.class.php @@ -17,8 +17,9 @@ class addon extends ModuleObject { // Register to add a few $oAddonController = getAdminController('addon'); - $oAddonController->doInsert('autolink', 0, 'site', 'Y'); - $oAddonController->doInsert('resize_image', 0, 'site', 'Y'); + $oAddonController->doInsert('autolink', 0, 'site', 'YY'); + $oAddonController->doInsert('photoswipe', 0, 'site', 'YY'); + $oAddonController->doInsert('resize_image', 0, 'site', 'YY'); $oAddonController->makeCacheFile(0); } diff --git a/modules/addon/queries/insertAddon.xml b/modules/addon/queries/insertAddon.xml index c0684b2bc..eb7167a21 100644 --- a/modules/addon/queries/insertAddon.xml +++ b/modules/addon/queries/insertAddon.xml @@ -5,6 +5,7 @@ +