Update static file getter

carry0987 · Jul 15, 2024 · 585ac5b · 585ac5b
1 parent d151929
commit 585ac5b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Asset.php b/src/Asset.php
@@ -423,6 +423,14 @@ public function loadJSFile(string $file)
         return $file.'?v='.$js_version_check['verhash'];
     }
 
+    //Load static files
+    public function loadStaticFile(string $file)
+    {
+        $file = Utils::trimPath($this->options['static_dir'].Template::DIR_SEP.$file);
+
+        return $file;
+    }
+
     //Throw error excetpion
     private static function throwError(string $message, string $file_msg = null)
     {

diff --git a/src/Template.php b/src/Template.php
@@ -472,7 +472,7 @@ private function parse_static_1(array $matches)
     {
         if ($this->options['static_dir'] === false) return $matches[1];
 
-        return $this->options['static_dir'].$matches[1];
+        return $this->stripvTags('<? echo TPL::getAsset()->loadStaticFile(\''.$matches[1].'\');?>');
     }
 
     private function parse_stripvtags_echo1(array $matches)