1 files changed, 3 insertions, 2 deletions
diff --git a/pmwiki.php b/pmwiki.php
index a8c2a36b..1b7e6b24 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -1507,6 +1507,7 @@ function FmtGroupHome($pn,$group,$var) {
 ## {$$key} in $text with $vars['key'].
 function FmtTemplateVars($text, $vars, $pagename = NULL) {
   global $FmtPV, $EnableUndefinedTemplateVars;
+  $text = strval($text);
   if ($pagename) {
     $pat = implode('|', array_map('preg_quote', array_keys($FmtPV)));
     $pprc = new PPRC($pagename);
@@ -1514,8 +1515,8 @@ function FmtTemplateVars($text, $vars, $pagename = NULL) {
               array($pprc, 'pagevar'), $text);
   }
   foreach(preg_grep('/^[\\w$]/', array_keys($vars)) as $k)
-    if (!is_array($vars[$k]))
-      $text = str_replace("{\$\$$k}", @$vars[$k], $text);
+    if (!is_array($vars[$k]) && $text)
+      $text = str_replace("{\$\$$k}", strval(@$vars[$k]), $text);
   if (! IsEnabled($EnableUndefinedTemplateVars, 0))
     $text = preg_replace("/\\{\\$\\$\\w+\\}/", '', $text);
   return $text;