bug 50 : PHP 5.x incompatibility

git-svn-id: http://piwigo.org/svn/branches/release-1_3@546 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub
2004-10-03 10:21:45 +00:00
parent a896587970
commit 39a466c193
+1 -1
View File
@@ -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;
}