From b12f6314c43aa013e80e10414cf41eac988c26fa Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 12 Nov 2014 13:34:53 +0000 Subject: fixes #288 on branch 2.7 (cherry-pick of commit 40256be64a61f3f8fda734a292d47c0ba4d54c1c from master) bug 3174 fixed: avoid using load_conf_from_db, use 3rd parameter updateGlobal instead git-svn-id: http://piwigo.org/svn/trunk@30460 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/smartpocket/admin/maintain.inc.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'themes/smartpocket/admin/maintain.inc.php') diff --git a/themes/smartpocket/admin/maintain.inc.php b/themes/smartpocket/admin/maintain.inc.php index d3beb4873..92fe7b1e3 100644 --- a/themes/smartpocket/admin/maintain.inc.php +++ b/themes/smartpocket/admin/maintain.inc.php @@ -14,27 +14,25 @@ class smartpocket_maintain extends ThemeMaintain if (empty($conf['smartpocket'])) { - $conf['smartpocket'] = serialize($this->default_conf); - $query = " - INSERT INTO " . CONFIG_TABLE . " (param,value,comment) - VALUES ('smartpocket' , '".pwg_db_real_escape_string($conf['smartpocket'])."' , 'loop#autohide');"; - pwg_query($query); + conf_update_param('smartpocket', $this->default_conf, true); } - elseif (count(unserialize( $conf['smartpocket'] ))!=2) + elseif (count(safe_unserialize($conf['smartpocket'])) != 2) { - $conff=unserialize($conf['smartpocket']); + $conff = safe_unserialize($conf['smartpocket']); + $config = array( - 'loop' => (!empty($conff['loop'])) ? $conff['loop'] :true, - 'autohide' => (!empty($conff['autohide'])) ? $conff['autohide'] :5000, + 'loop' => (!empty($conff['loop'])) ? $conff['loop'] :true, + 'autohide' => (!empty($conff['autohide'])) ? $conff['autohide'] :5000, ); - conf_update_param('smartpocket', pwg_db_real_escape_string(serialize($config))); - load_conf_from_db(); + + conf_update_param('smartpocket', $config, true); } $this->installed = true; } function deactivate() - { } + { + } function delete() { -- cgit v1.2.3