From 53b70d27fbc7befb40daa8f86e16fdd03e173bc6 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 26 Nov 2014 11:18:03 -0500 Subject: [PATCH] Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files. --- web/skins/classic/includes/functions.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 66be5c668..8b329cd88 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -20,14 +20,16 @@ function xhtmlHeaders( $file, $title ) { - $skinCssFile = getSkinFile( 'css/skin.css' ); - $skinCssPhpFile = getSkinFile( 'css/skin.css.php' ); + global $css; + $skinCssFile = getSkinFile( 'css/'.$css.'/skin.css' ); + $skinCssPhpFile = getSkinFile( 'css/'.$css.'/skin.css.php' ); + $skinJsFile = getSkinFile( 'js/skin.js' ); $skinJsPhpFile = getSkinFile( 'js/skin.js.php' ); $basename = basename( $file, '.php' ); - $viewCssFile = getSkinFile( 'views/css/'.$basename.'.css' ); - $viewCssPhpFile = getSkinFile( 'views/css/'.$basename.'.css.php' ); + $viewCssFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css' ); + $viewCssPhpFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css.php' ); $viewJsFile = getSkinFile( 'views/js/'.$basename.'.js' ); $viewJsPhpFile = getSkinFile( 'views/js/'.$basename.'.js.php' );