fix resetting of userstyle

samfisch · Dec 23, 2011 · 929d1ba · 929d1ba
1 parent fa12578
commit 929d1ba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/action/templateaction.php b/action/templateaction.php
@@ -54,7 +54,7 @@ function template_action( ) {/*{{{*/
         $this->save_session( 'template', $tpl );
     }
     if( isset( $_GET['utpl'] ) && $_GET['utpl'] == "" ) {
-	$tpl = $conf['default_tpl']; 
+	$tpl = ""; 
         $this->save_session( 'template', $tpl );
 	$switch = false;
     }
@@ -110,7 +110,7 @@ public function tpl_switch(  $tpl ) {/*{{{*/
     if( $conf['template'] == $tpl ) { return ''; }
 
   // prevent userstyle from beeing overwritten ... one or the other way 
-    if( $this->u['template'] ) { return ''; }
+    if( $this->get_user( 'template' )) { return ''; }
     if( preg_match( '/^[\w-]+$/', $tpl )) {
 	    $this->_switch( $tpl );
     }