Aliasing should be avoided, better we rename the column or/and use direct column...

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 12838b3b3392d8bab258b01df89c1a38bad66e1f..14e30495454a9a0857703ae9282ba29a050f2704 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -54,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 ((isCssOutputMode()) || (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) {
@@ -78,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 ((isHtmlOutputMode()) || (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 = '';
@@ -116,7 +116,7 @@ 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