From 39a466c193bd34c1f54d5f195a31a3c4bf263887 Mon Sep 17 00:00:00 2001
From: z0rglub <z0rglub@piwigo.org>
Date: Sun, 3 Oct 2004 10:21:45 +0000
Subject: bug 50 : PHP 5.x incompatibility

git-svn-id: http://piwigo.org/svn/branches/release-1_3@546 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/vtemplate.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/vtemplate.class.php b/include/vtemplate.class.php
index 45dfd7f10..dcf48bf9b 100644
--- a/include/vtemplate.class.php
+++ b/include/vtemplate.class.php
@@ -141,7 +141,7 @@ if ( !isset( $DEFINE_VTEMPLATE ) )
       $regle = "|".VARTAG."(.*)}|sU"; 
       preg_match_all ($regle,$this->source,$var1);
       // Création du tableau de variable  à partir de la liste parsée.
-      $this->varlist=@array_merge($var[1],$var1[1]);
+      $this->varlist=@array_merge((array)$var[1],(array)$var1[1]);
       return 1;
     }
 
-- 
cgit v1.2.3