aboutsummaryrefslogtreecommitdiffstats
path: root/themes/elegant/admin/upgrade.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-11-12 13:34:53 +0000
committerplegall <plg@piwigo.org>2015-09-29 12:28:31 +0200
commitb12f6314c43aa013e80e10414cf41eac988c26fa (patch)
tree3bf304dc310ed29204e02768fba883125db33658 /themes/elegant/admin/upgrade.inc.php
parent5e76fb4ce6d61cabfd120e77096e2e57c357cb8b (diff)
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
Diffstat (limited to 'themes/elegant/admin/upgrade.inc.php')
-rw-r--r--themes/elegant/admin/upgrade.inc.php27
1 files changed, 12 insertions, 15 deletions
diff --git a/themes/elegant/admin/upgrade.inc.php b/themes/elegant/admin/upgrade.inc.php
index 6cda1318a..b07fb4768 100644
--- a/themes/elegant/admin/upgrade.inc.php
+++ b/themes/elegant/admin/upgrade.inc.php
@@ -7,25 +7,22 @@ global $prefixeTable, $conf;
if (!isset($conf['elegant']))
{
$config = array(
- 'p_main_menu' => 'on',//on - off - disabled
- 'p_pict_descr' => 'on',//on - off - disabled
- 'p_pict_comment' => 'off',//on - off - disabled
+ 'p_main_menu' => 'on', //on - off - disabled
+ 'p_pict_descr' => 'on', //on - off - disabled
+ 'p_pict_comment' => 'off', //on - off - disabled
);
- $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('elegant' , '".pwg_db_real_escape_string(serialize($config))."' , 'p_main_menu#');";
- pwg_query($query);
- load_conf_from_db();
+
+ conf_update_param('elegant', $config, true);
}
-elseif (count(unserialize( $conf['elegant'] ))!=3)
+elseif (count(safe_unserialize( $conf['elegant'] ))!=3)
{
- $conff=unserialize($conf['elegant']);
+ $conff = safe_unserialize($conf['elegant']);
$config = array(
- 'p_main_menu' => (isset($conff['p_main_menu'])) ? $conff['p_main_menu'] :'on',
- 'p_pict_descr' => (isset($conff['p_pict_descr'])) ? $conff['p_pict_descr'] :'on',
- 'p_pict_comment' => (isset($conff['p_pict_comment'])) ? $conff['p_pict_comment'] :'off',
+ 'p_main_menu' => (isset($conff['p_main_menu'])) ? $conff['p_main_menu'] :'on',
+ 'p_pict_descr' => (isset($conff['p_pict_descr'])) ? $conff['p_pict_descr'] :'on',
+ 'p_pict_comment' => (isset($conff['p_pict_comment'])) ? $conff['p_pict_comment'] :'off',
);
- conf_update_param('elegant', pwg_db_real_escape_string(serialize($config)));
- load_conf_from_db();
+
+ conf_update_param('elegant', $config, true);
}
?> \ No newline at end of file