mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 12:49:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r10425 from branch 2.2 to trunk

Browse source 
bug 2242 fixed: default theme is changed if upgrade.php deactivated the previous theme.



git-svn-id: http://piwigo.org/svn/trunk@10426 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-04-16 17:41:41 +00:00
parent d33d216847
commit cb2b12b3a6
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
admin/include/functions_upgrade.php
View file

@ -113,7 +113,7 @@ WHERE id IN (\'' . implode('\',\'', $plugins) . '\')
// Deactivate all non-standard themes
function deactivate_non_standard_themes()
{
global $page;
global $page, $conf;
$standard_themes = array(
'clear',
@ -148,6 +148,25 @@ DELETE
array_push($page['infos'],
l10n('As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:').'<p><i>'.implode(', ', $theme_names).'</i></p>');
// what is the default theme?
$query = '
SELECT theme
FROM '.PREFIX_TABLE.'user_infos
WHERE user_id = '.$conf['default_user_id'].'
;';
list($default_theme) = pwg_db_fetch_row(pwg_query($query));
// if the default theme has just been deactivated, let's set another core theme as default
if (in_array($default_theme, $theme_ids))
{
$query = '
UPDATE '.PREFIX_TABLE.'user_infos
SET theme = \'Sylvia\'
WHERE user_id = '.$conf['default_user_id'].'
;';
pwg_query($query);
}
}
}