adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 3174 fixed: avoid using load_conf_from_db, use 3rd parameter updateGlobal instead

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@30460 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2014-11-12 13:34:53 +00:00
parent c54c6f9db9
commit 40256be64a
6 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/elegant/admin/upgrade.inc.php
+12 -15
View File
@@ -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);
}
?>