mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 11:19:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

issue #1641 make admin_theme related to user instead of config

Browse source
This commit is contained in:
plegall 2022-03-31 18:23:26 +02:00
parent c2f8238e16
commit c4f0727176
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin.php
View file

@ -44,7 +44,7 @@ if (isset($_GET['plugins_new_order']))
if (isset($_GET['change_theme']))
{
$admin_themes = array('roma', 'clear');
$admin_theme_array = array($conf['admin_theme']);
$admin_theme_array = array(userprefs_get_param('admin_theme', 'clear'));
$result = array_diff(
$admin_themes,
$admin_theme_array
@ -54,7 +54,7 @@ if (isset($_GET['change_theme']))
$result
);
conf_update_param('admin_theme', $new_admin_theme);
userprefs_update_param('admin_theme', $new_admin_theme);
$url_params = array();
foreach (array('page', 'tab', 'section') as $url_param)

2
admin/include/themes.class.php
View file

@ -420,7 +420,7 @@ SELECT
global $conf;
$theme['screenshot'] =
PHPWG_ROOT_PATH.'admin/themes/'
.$conf['admin_theme']
.userprefs_get_param('admin_theme', 'clear')
.'/images/missing_screenshot.png'
;
}

4
admin/themes_new.php
View file

@ -116,8 +116,8 @@ else
}
$template->assign('default_screenshot',
get_root_url().'admin/themes/'.$conf['admin_theme'].'/images/missing_screenshot.png'
get_root_url().'admin/themes/'.userprefs_get_param('admin_theme', 'clear').'/images/missing_screenshot.png'
);
$template->assign_var_from_handle('ADMIN_CONTENT', 'themes');
?>
?>

2
include/common.inc.php
View file

@ -221,7 +221,7 @@ if (isset($page['auth_key_invalid']) and $page['auth_key_invalid'])
// template instance
if (defined('IN_ADMIN') and IN_ADMIN )
{// Admin template
$template = new Template(PHPWG_ROOT_PATH.'admin/themes', $conf['admin_theme']);
$template = new Template(PHPWG_ROOT_PATH.'admin/themes', userprefs_get_param('admin_theme', 'clear'));
}
else
{ // Classic template