X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fstylesheet.php;h=715bf8fc4cf23fd531bd8670b231d45a49c12848;hb=b8aabe693f9dd188237d0d1563aad63351d80af8;hp=6e4ac65e7f71d626c6f6bfc0dccce85615b1d8bc;hpb=af57cc214f46f69247698f50d2eec74a8449b79c;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 6e4ac65e7f..715bf8fc4c 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
switch (getConfig('css_php')) {
case 'DIRECT': // Just link them (unsupported)
- outputHtml('');
+ $GLOBALS['page_header'] .= '';
break;
case 'FILE': // Output contents
- outputHtml(readFromFile($FQFN));
+ $GLOBALS['page_header'] .= readFromFile($FQFN);
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 ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
// Load CSS files
- $STYLES = merge_array($STYLES, getExtensionCssFiles());
+ $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 = '';
- foreach ($STYLES as $value) {
+ foreach ($stylesList as $value) {
// Only include found CSS files (to reduce 404 requests)
$FQFN = $basePath . $value;
@@ -103,23 +102,26 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
} // END - foreach
// Load template
- loadTemplate('css_inline', false, $OUT);
+ $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT);
} else {
// Now we load all CSS files from css.php!
- outputHtml('');
+ $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]