fixes #288 on branch 2.7 (cherry-pick of commit 40256be64a61f3f8fda734a292d47c0ba4d54c1c from master)2.7

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

1 files changed, 9 insertions, 13 deletions

diff --git a/themes/smartpocket/admin/upgrade.inc.php b/themes/smartpocket/admin/upgrade.inc.php
index 1e1925d77..53e4e1aae 100644
--- a/themes/smartpocket/admin/upgrade.inc.php
+++ b/themes/smartpocket/admin/upgrade.inc.php
@@ -7,23 +7,19 @@ global $prefixeTable, $conf;
 if (!isset($conf['smartpocket']))
 {
   $config = array(
-    'loop'            => true,//true - false
-    'autohide'            => 5000,//5000 - 0
+    'loop' => true,//true - false
+    'autohide' => 5000,//5000 - 0
   );
-  $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('smartpocket' , '".pwg_db_real_escape_string(serialize($config))."' , 'loop#autohide');";
-  pwg_query($query);
-  load_conf_from_db();
+
+  conf_update_param('smartpocket', $config, 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);
 }
 ?>
\ No newline at end of file