X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=c8c0565234a89abe8b49683e821bc926dc6fe18e;hb=f585bb39812d6f027725b87fa9f845e0dfe3b306;hp=d77e9c93318db48f5d54adb9bd93d9bb55541c01;hpb=ccf34a2a92d80d01debd84b4b6e1f294d8f90cce;p=mailer.git diff --git a/inc/stylesheet.php b/inc/stylesheet.php index d77e9c9331..c8c0565234 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -53,12 +54,12 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css'; if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE'); // Output CSS files or content or link to css.php ? -if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { +if ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { // Load CSS files $stylesList = merge_array($stylesList, getExtensionCssFiles()); // Generate base path - $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme()); + $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme()); // Output inclusion lines foreach ($stylesList as $value) { @@ -77,17 +78,17 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { break; default: // Invalid mode! - debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php'))); + debug_report_bug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php'))); break; } // END - switch } // END - if } // END - foreach -} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) { +} elseif ((getScriptOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) { // Load CSS files $stylesList = merge_array($stylesList, getExtensionCssFiles()); // Generate base path - $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme()); + $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme()); // Output inclusion lines $OUT = ''; @@ -115,11 +116,11 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { $OUT .= '?theme=' . $newTheme . '&installing=1'; } else { // Add SVN revision to bypass caching problems - $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION'); + $OUT .= '?rev=' . getCurrSvnRevision(); } // Close tag - $GLOBALS['page_header'] .= $OUT . '%}" />'; + $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />'; } // [EOF]