use fancybox instead of lightbox

[friendica.git] / include / template_processor.php

diff --git a/include/template_processor.php b/include/template_processor.php
index 9ac0a13131153ef9398bf2084c97755dd59f33b6..8671587fc4b48d57d60934cfd350c89aef2f00aa 100755 (executable)
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -160,13 +160,24 @@
 
                private function var_replace($s){
                        $m = array();
-                       if (preg_match_all('/\$([a-zA-Z0-9-_]+\.*)+/', $s,$m)){
+                       /** regexp:
+                        * \$                                           literal $
+                        * (\[)?                                        optional open square bracket
+                        * ([a-zA-Z0-9-_]+\.?)+         var name, followed by optional
+                        *                                                      dot, repeated at least 1 time
+                        * (?(1)\])                                     if there was opened square bracket
+                        *                                                      (subgrup 1), match close bracket
+                        */
+                       if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)){
+                               
                                foreach($m[0] as $var){
-                                       $val = $this->_get_var($var, true);
+                                       $varn = str_replace(array("[","]"), array("",""), $var);
+                                       $val = $this->_get_var($varn, true);
                                        if ($val!=KEY_NOT_EXISTS)
                                                $s = str_replace($var, $val, $s);
                                }
                        }
+                       
                        return $s;
                }