openrat-cms

commit 5213fb2523c062b032516ae4f101f898be7a9cb5
parent e1cda13b79d776b154dac69bde7ae17af6367566
Author: dankert <devnull@localhost>
Date:   Sat, 21 Apr 2007 13:49:40 +0200

Keine Variable "style" verwenden (?berschreibt andere Variablen!)

Diffstat:
actionClasses/Action.class.php
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/actionClasses/Action.class.php b/actionClasses/Action.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.30  2007-04-21 11:49:40  dankert
+// Keine Variable "style" verwenden (?berschreibt andere Variablen!)
+//
 // Revision 1.29  2007-04-21 00:01:53  dankert
 // Unterscheiden zwischen Root-, Default- und Benutzer-Stylesheet.
 //
@@ -267,15 +270,14 @@ class Action
 		$image_dir  = OR_THEMES_DIR.$conf['interface']['theme'].'/images/';
 	
 		$user = Session::getUser();
-		$style = $conf['interface']['style'];
 		
-		if	( strpos($style['extend'],'/')===false )
-			$root_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$style['extend'].'.css';
+		if	( strpos($conf['interface']['style']['extend'],'/')===false )
+			$root_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['extend'].'.css';
 		else
 			$root_stylesheet = $style['extend'];
 			
 		if	( !is_object($user) )
-			$user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$style['default'].'.css';
+			$user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['default'].'.css';
 		else
 			$user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$user->style.'.css';