Fixes: #2409 fixes a wheezy problem with filePath

22aaa611 · Côme Bernigaud · Benoit Mortier · 9052394e · 22aaa611
Commit 22aaa611 authored 11 years ago by Côme Bernigaud Committed by Benoit Mortier 11 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 4 deletions
+8 -4
--- a/contrib/smarty/plugins/function.filePath.php
+++ b/contrib/smarty/plugins/function.filePath.php
@@ -16,14 +16,18 @@ function smarty_function_filePath($params, &$smarty)
  if (file_exists("themes/$theme/$filename")) {
    return "themes/$theme/$filename";
  }
-  if (file_exists($smarty->template_dir."/themes/$theme/$filename")) {
+  $dir = $smarty->template_dir;
-    return $smarty->template_dir."/themes/$theme/$filename";
+  if (is_array($dir)) {
+    $dir = $dir[0];
+  }
+  if (file_exists("$dir/themes/$theme/$filename")) {
+    return "$dir/themes/$theme/$filename";
  }
  if (file_exists("themes/default/$filename")) {
    return "themes/default/$filename";
  }
-  if (file_exists($smarty->template_dir."/themes/default/$filename")) {
+  if (file_exists("$dir/themes/default/$filename")) {
-    return $smarty->template_dir."/themes/default/$filename";
+    return "$dir/themes/default/$filename";
  }
  return $filename;
 }