From a949b95763aa13d68ab9ec6325ee52174f84b1f9 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 18 Apr 2016 21:22:31 +0900 Subject: [PATCH] Improve cache efficiency when loading module part config --- classes/db/DB.class.php | 2 +- modules/module/module.model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index e9f75a05f..3ae3fa497 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -369,7 +369,7 @@ class DB $log['time'] = date('Y-m-d H:i:s'); $log['backtrace'] = array(); - if (config('debug.enabled') && config('debug.log_queries')) + if (config('debug.enabled') && in_array('queries', config('debug.display_content'))) { $bt = defined('DEBUG_BACKTRACE_IGNORE_ARGS') ? debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) : debug_backtrace(); foreach($bt as $no => $call) diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 2fa46516d..17b1ea0e7 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -1345,13 +1345,13 @@ class moduleModel extends module else $config = null; //insert in cache - Rhymix\Framework\Cache::set('site_and_module:module_part_config:' . $module . '_' . $module_srl, $config); + Rhymix\Framework\Cache::set('site_and_module:module_part_config:' . $module . '_' . $module_srl, $config === null ? 0 : $config); $GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config; } return $GLOBALS['__ModulePartConfig__'][$module][$module_srl]; } - return $config; + return $config === 0 ? null : $config; } /**