Changeset 23588

Timestamp:

Jun 27, 2013, 6:37:38 AM (11 years ago)

Author:

rvelices

Message:

fix define_derivative (matter of smarty3 variable scope)

File:

• trunk/include/template.class.php (modified) (7 diffs)

trunk/include/template.class.php

@@ -407 +407 @@
           }
 
-          $this->output = substr_replace( $this->output, "\n".implode( "\n", $content ), $pos, strlen(self::COMBINED_SCRIPTS_TAG) );
+          $this->output = substr_replace( $this->output, implode( "\n", $content ), $pos, strlen(self::COMBINED_SCRIPTS_TAG) );
       } //else maybe error or warning ?
     }
@@ -575 +575 @@
   }
 
-  function func_define_derivative($params)
+  function func_define_derivative($params, $smarty)
   {
     !empty($params['name']) or fatal_error('define_derivative missing name');
@@ -581 +581 @@
     {
       $derivative = ImageStdParams::get_by_type($params['type']);
-      $this->smarty->assign( $params['name'], $derivative);
+      $smarty->assign( $params['name'], $derivative);
       return;
     }
@@ -613 +613 @@
     }
 
-    $this->smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) );
+    $smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) );
   }
 
@@ -831 +831 @@
     foreach($tags as $tag)
     {
-      array_push($regex, "#^[ \t]+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m");
-      array_push($regex, "#^[ \t]+($ldq/$tag$rdq)\s*$#m");
+      $regex[] = "#^[ \t]+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m";
+      $regex[] = "#^[ \t]+($ldq/$tag$rdq)\s*$#m";
     }
     $tags = array('include','else','combine_script','html_head');
     foreach($tags as $tag)
     {
-      array_push($regex, "#^[ \t]+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m");
+      $regex[] = "#^[ \t]+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m";
     }
     $source = preg_replace( $regex, "$1", $source);
@@ -867 +867 @@
       if (file_exists(PHPWG_ROOT_PATH.$f))
       {
-        array_push($css, "{combine_css path='$f' order=10}");
+        $css[] = "{combine_css path='$f' order=10}";
       }
     }
@@ -873 +873 @@
     if (file_exists(PHPWG_ROOT_PATH.$f))
     {
-      array_push($css, "{combine_css path='$f' order=10}");
+      $css[] = "{combine_css path='$f' order=10}";
     }