diff options
| author | plegall <plg@piwigo.org> | 2014-11-12 13:34:53 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-11-12 13:34:53 +0000 |
| commit | 40256be64a61f3f8fda734a292d47c0ba4d54c1c (patch) | |
| tree | d2bf677bf61f0e1a310b71006fc314daf0ae1cbc /themes/elegant/admin/upgrade.inc.php | |
| parent | c54c6f9db98638915f46f89d92232930fc050d1e (diff) | |
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 '')
| -rw-r--r-- | themes/elegant/admin/upgrade.inc.php | 27 |
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 |