Fixes bug in template class

SourceCode · SourceCode · commit 34d8354efd8f · 2015-01-23T22:03:50.000-08:00
diff --git a/system/core/template.php b/system/core/template.php
@@ -22,7 +22,6 @@ class Template extends DataStore
     * Stores CSS includes for the template system
     */
     private static $cssIncludes = array();
-
     
     /**
     * Checks if a value exists
@@ -71,7 +70,7 @@ public static function addCSS($file)
     */
     public static function getJs()
     {
-        $jsFiles = '';
+        $jsList = '';
         if (is_array(self::$jsIncludes))
         {
             foreach(self::$jsIncludes as $js)
@@ -94,7 +93,7 @@ public static function getCSS()
         {
             foreach(self::$cssIncludes as $css)
             {
-                $cssList .= '<script type="text/javascript" src="' . $css . '"></script>' . "\r\n";
+                $cssList .= '<link href="' . $css . '" rel="stylesheet">' . "\r\n";
             }
             return $cssList;
         }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ class Template extends DataStore`
`22`	`22`	`* Stores CSS includes for the template system`
`23`	`23`	`*/`
`24`	`24`	`private static $cssIncludes = array();`
`25`		`-`
`26`	`25`
`27`	`26`	`/**`
`28`	`27`	`* Checks if a value exists`
`@@ -71,7 +70,7 @@ public static function addCSS($file)`
`71`	`70`	`*/`
`72`	`71`	`public static function getJs()`
`73`	`72`	`{`
`74`		`- $jsFiles = '';`
	`73`	`+ $jsList = '';`
`75`	`74`	`if (is_array(self::$jsIncludes))`
`76`	`75`	`{`
`77`	`76`	`foreach(self::$jsIncludes as $js)`
`@@ -94,7 +93,7 @@ public static function getCSS()`
`94`	`93`	`{`
`95`	`94`	`foreach(self::$cssIncludes as $css)`
`96`	`95`	`{`
`97`		`- $cssList .= '<script type="text/javascript" src="' . $css . '"></script>' . "\r\n";`
	`96`	`+ $cssList .= '<link href="' . $css . '" rel="stylesheet">' . "\r\n";`
`98`	`97`	`}`
`99`	`98`	`return $cssList;`
`100`	`99`	`}`