#171951 by dvessel: fix account specific theme selection form
parent
9c2f47eafd
commit
6da81e1f3f
|
@ -41,7 +41,7 @@ function init_theme() {
|
||||||
|
|
||||||
// Only select the user selected theme if it is available in the
|
// Only select the user selected theme if it is available in the
|
||||||
// list of enabled themes.
|
// list of enabled themes.
|
||||||
$theme = !empty($user->theme) && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'garland');
|
$theme = !empty($user->theme) && !empty($themes[$user->theme]->status) ? $user->theme : variable_get('theme_default', 'garland');
|
||||||
|
|
||||||
// Allow modules to override the present theme... only select custom theme
|
// Allow modules to override the present theme... only select custom theme
|
||||||
// if it is available in the list of installed themes.
|
// if it is available in the list of installed themes.
|
||||||
|
|
|
@ -527,7 +527,7 @@ function system_admin_theme_submit($form, &$form_state) {
|
||||||
* @return
|
* @return
|
||||||
* a form array
|
* a form array
|
||||||
*/
|
*/
|
||||||
function system_theme_select_form(&$form_state, $description = '', $default_value = '', $weight = 0) {
|
function system_theme_select_form($description = '', $default_value = '', $weight = 0) {
|
||||||
if (user_access('select different theme')) {
|
if (user_access('select different theme')) {
|
||||||
$enabled = array();
|
$enabled = array();
|
||||||
$themes = list_themes();
|
$themes = list_themes();
|
||||||
|
|
Loading…
Reference in New Issue