Skip to content

Commit

Permalink
fix error
Browse files Browse the repository at this point in the history
  • Loading branch information
fuzegit committed Dec 5, 2016
1 parent 45c96f3 commit 12c5734
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions system/core/template.php
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ public function addControllerJS($path, $cname = '', $comment = '', $allow_merge
$js_file = $this->getTplFilePath("controllers/{$cname}/js/{$path}.js", false);

if($js_file){
return $this->addJS($path, $comment, $allow_merge);
return $this->addJS($js_file, $comment, $allow_merge);
}

return false;
Expand All @@ -729,7 +729,7 @@ public function addControllerCSS($path, $cname = '', $allow_merge = true){
$css_file = $this->getTplFilePath("controllers/{$cname}/css/{$path}.css", false);

if($css_file){
return $this->addCSS($path, $allow_merge);
return $this->addCSS($css_file, $allow_merge);
}

return false;
Expand Down

0 comments on commit 12c5734

Please sign in to comment.