diff --git a/system/cms/plugins/asset.php b/system/cms/plugins/asset.php index 0971674368d..32bb4d76d1a 100644 --- a/system/cms/plugins/asset.php +++ b/system/cms/plugins/asset.php @@ -25,9 +25,10 @@ class Plugin_Asset extends Plugin public function css() { $file = $this->attribute('file'); + $file_min = $this->attribute('file_min'); $group = $this->attribute('group'); - return Asset::css($file, NULL, $group); + return Asset::css($file, $file_min, $group); } /** @@ -45,7 +46,7 @@ public function css_url() { $file = $this->attribute('file'); - return Asset::get_filepath_js($file, true); + return Asset::get_filepath_css($file, TRUE); } /** @@ -55,7 +56,7 @@ public function css_url() * * Usage: * - * {{ asset:css_path file="" module="" }} + * {{ asset:css_path file="" }} * * @return string Path to the CSS asset relative to web root */ @@ -63,7 +64,7 @@ public function css_path() { $file = $this->attribute('file'); - return BASE_URI.Asset::get_filepath_js($file, FALSE); + return BASE_URI.Asset::get_filepath_css($file, FALSE); } /** @@ -104,7 +105,7 @@ public function image_url() { $file = $this->attribute('file'); - return Asset::get_filepath_img($file, true); + return Asset::get_filepath_img($file, TRUE); } /** @@ -122,7 +123,7 @@ public function image_path() { $file = $this->attribute('file'); - return BASE_URI.Asset::get_filepath_img($file, false); + return BASE_URI.Asset::get_filepath_img($file, FALSE); } /** @@ -139,9 +140,10 @@ public function image_path() public function js() { $file = $this->attribute('file'); + $file_min = $this->attribute('file_min'); $group = $this->attribute('group'); - return Asset::js($file, NULL, $group); + return Asset::js($file, $file_min, $group); } /** @@ -159,7 +161,7 @@ public function js_url() { $file = $this->attribute('file'); - return Asset::get_filepath_js($file, true); + return Asset::get_filepath_js($file, TRUE); } /** @@ -177,7 +179,7 @@ public function js_path() { $file = $this->attribute('file'); - return BASE_URI.Asset::get_filepath_js($file, false); + return BASE_URI.Asset::get_filepath_js($file, FALSE); } /** @@ -193,7 +195,7 @@ public function js_path() */ public function render() { - $group = $this->attribute('group', false); + $group = $this->attribute('group', FALSE); return Asset::render($group); } @@ -211,7 +213,7 @@ public function render() */ public function render_css() { - $group = $this->attribute('group', false); + $group = $this->attribute('group', FALSE); return Asset::render_css($group); } @@ -229,7 +231,7 @@ public function render_css() */ public function render_js() { - $group = $this->attribute('group', false); + $group = $this->attribute('group', FALSE); return Asset::render_js($group); }