diff options
author | plegall <plg@piwigo.org> | 2014-11-12 13:34:53 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2015-09-29 12:28:31 +0200 |
commit | b12f6314c43aa013e80e10414cf41eac988c26fa (patch) | |
tree | 3bf304dc310ed29204e02768fba883125db33658 /themes/elegant | |
parent | 5e76fb4ce6d61cabfd120e77096e2e57c357cb8b (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')
-rw-r--r-- | themes/elegant/admin/admin.inc.php | 5 | ||||
-rw-r--r-- | themes/elegant/admin/upgrade.inc.php | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/themes/elegant/admin/admin.inc.php b/themes/elegant/admin/admin.inc.php index bbb03c1c7..7f68dc072 100644 --- a/themes/elegant/admin/admin.inc.php +++ b/themes/elegant/admin/admin.inc.php @@ -14,8 +14,7 @@ if(isset($_POST['submit_elegant'])) $config_send['p_pict_descr']=(isset($_POST['p_pict_descr']) and !empty($_POST['p_pict_descr'])) ? $_POST['p_pict_descr'] : 'on'; $config_send['p_pict_comment']=(isset($_POST['p_pict_comment']) and !empty($_POST['p_pict_comment'])) ? $_POST['p_pict_comment'] : 'off'; - $conf['elegant'] = serialize($config_send); - conf_update_param('elegant', pwg_db_real_escape_string($conf['elegant'])); + conf_update_param('elegant', $config_send, true); array_push($page['infos'], l10n('Information data registered in database')); } @@ -23,7 +22,7 @@ if(isset($_POST['submit_elegant'])) $template->set_filenames(array( 'theme_admin_content' => dirname(__FILE__) . '/admin.tpl')); -$template->assign('options', unserialize($conf['elegant'])); +$template->assign('options', safe_unserialize($conf['elegant'])); $template->assign_var_from_handle('ADMIN_CONTENT', 'theme_admin_content'); 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 @@ -11,21 +11,18 @@ if (!isset($conf['elegant'])) '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', ); - 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 |