Skip to content
Permalink
Browse files

base_tpl precedence

  • Loading branch information
alice-wl authored and alice committed Oct 28, 2012
1 parent 9b2bd74 commit 4373d8f25bc520cd79722a7580551687c0022958
Showing with 6 additions and 1 deletion.
  1. +6 −1 action/templateaction.php
@@ -35,9 +35,14 @@ function template_action( ) {/*{{{*/
$theme = '';
$switch = false;
if( $conf['plugin']['templateconfhelper']['base_tpl'] != $tpl ) {
$tpl = $conf['plugin']['templateconfhelper']['base_tpl'];
$switch = true;
}
$u = $this->get_user( ); // init user data
if( isset( $u['template'] ) && $u['template'] != $tpl ) {
if( isset( $u['template'] ) && $u['template'] && $u['template'] != $tpl ) {
$tpl = $u['template'];
$switch = true;
}

0 comments on commit 4373d8f

Please sign in to comment.
You can’t perform that action at this time.