From cb2b12b3a66767cbe604bf6a7ca8cfd05f039e60 Mon Sep 17 00:00:00 2001 From: plegall Date: Sat, 16 Apr 2011 17:41:41 +0000 Subject: merge r10425 from branch 2.2 to trunk 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 --- admin/include/functions_upgrade.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'admin/include/functions_upgrade.php') diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 4e0bbbb23..7db6cf40e 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -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:').'

'.implode(', ', $theme_names).'

'); + + // 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); + } } } -- cgit v1.2.3