fix some quirks with recent scss compilation code...scss ONLY availab…

…le in bs4 themes (with bs4 stylesheet variable support)
exponentcms · Dec 20, 2017 · 6932cad · 6932cad
1 parent c5cb0f4
commit 6932cad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/core/subsystems/expCSS.php b/framework/core/subsystems/expCSS.php
@@ -682,11 +682,11 @@ public static function auto_compile_scss($scss_pname, $css_fname, $vars=array())
             switch ($scss_compiler) {
                 case 'scssphp':
                 default :
-                    //FIXME we need to account for leading _ with filename and missing filetype suffix
                     if (substr($scss_pname,-5,5) !== ".scss") {
-                        $filename .= ".scss";
+                        $scss_pname .= ".scss";
                     }
 
+                    // we need to account for leading _ with filename and missing filetype suffix
                     if (is_file(BASE . $scss_pname) || is_file(BASE . "_" . $scss_pname)) {
                         include_once(BASE . 'external/' . $scss_compiler . '/scss.inc.php');
                         $scss = new \Leafo\ScssPhp\Compiler();

diff --git a/framework/core/subsystems/expJavascript.php b/framework/core/subsystems/expJavascript.php
@@ -306,7 +306,7 @@ public static function parseJSFiles() {
                                 }
                             } elseif (file_exists(JQUERY_PATH . 'addons/js/' . $mod . '.js')) {
                                 $scripts .= "\t" . '<script type="text/javascript" src="' . JQUERY_RELATIVE . 'addons/js/' . $mod . '.js"></script>' . "\r\n";
-                                if (file_exists(JQUERY_PATH . 'addons/scss/' . $mod . '.scss')) {
+                                if (bs4() && file_exists(JQUERY_PATH . 'addons/scss/' . $mod . '.scss')) {
                                     expCSS::pushToHead(
                                         array(
                                             "scssprimer" => JQUERY_RELATIVE . 'addons/scss/' . $mod . '.scss',