aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-10-03 10:21:45 +0000
committerz0rglub <z0rglub@piwigo.org>2004-10-03 10:21:45 +0000
commit39a466c193bd34c1f54d5f195a31a3c4bf263887 (patch)
tree4b1edd120e887c8d8a155bd61a1fbf6331d2614d /include
parenta896587970450b289ee99191265b076d82e5c165 (diff)
bug 50 : PHP 5.x incompatibility
git-svn-id: http://piwigo.org/svn/branches/release-1_3@546 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/vtemplate.class.php2
1 files changed, 1 insertions, 1 deletions
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;
}