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

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
admin.php
+2 -2
View File
@@ -44,7 +44,7 @@ if (isset($_GET['plugins_new_order']))
if (isset($_GET['change_theme'])) if (isset($_GET['change_theme']))
{ {
$admin_themes = array('roma', 'clear'); $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( $result = array_diff(
$admin_themes, $admin_themes,
$admin_theme_array $admin_theme_array
@@ -54,7 +54,7 @@ if (isset($_GET['change_theme']))
$result $result
); );
conf_update_param('admin_theme', $new_admin_theme); userprefs_update_param('admin_theme', $new_admin_theme);
$url_params = array(); $url_params = array();
foreach (array('page', 'tab', 'section') as $url_param) foreach (array('page', 'tab', 'section') as $url_param)
admin/include/themes.class.php
+1 -1
View File
@@ -420,7 +420,7 @@ SELECT
global $conf; global $conf;
$theme['screenshot'] = $theme['screenshot'] =
PHPWG_ROOT_PATH.'admin/themes/' PHPWG_ROOT_PATH.'admin/themes/'
.$conf['admin_theme'] .userprefs_get_param('admin_theme', 'clear')
.'/images/missing_screenshot.png' .'/images/missing_screenshot.png'
; ;
} }
admin/themes_new.php
+2 -2
View File
@@ -116,8 +116,8 @@ else
} }
$template->assign('default_screenshot', $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'); $template->assign_var_from_handle('ADMIN_CONTENT', 'themes');
?> ?>
include/common.inc.php
+1 -1
View File
@@ -221,7 +221,7 @@ if (isset($page['auth_key_invalid']) and $page['auth_key_invalid'])
// template instance // template instance
if (defined('IN_ADMIN') and IN_ADMIN ) if (defined('IN_ADMIN') and IN_ADMIN )
{// Admin template {// 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 else
{ // Classic template { // Classic template