[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[24424] branches/proposals/4.x/lang/fr/custom. php_example

[<sy...@us...>]

Revision: 24424
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24424&view=rev
Author:   sylvieg
Date:     2010-01-15 22:49:12 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
[bp/r 24423][FIX]tra: array_merge does not preserve numeric key - as 0 is in langauge.php, it was transformed to 1 after the array_merge

Modified Paths:
--------------
    branches/proposals/4.x/lang/fr/custom.php_example

Modified: branches/proposals/4.x/lang/fr/custom.php_example
===================================================================
--- branches/proposals/4.x/lang/fr/custom.php_example	2010-01-15 22:43:16 UTC (rev 24423)
+++ branches/proposals/4.x/lang/fr/custom.php_example	2010-01-15 22:49:12 UTC (rev 24424)
@@ -3,4 +3,4 @@
 //"Hello"=>"My Hello",
 //"This is the place to customize your traduction"=>":-)",
 );
-$lang = array_merge($lang, $lang_custom);
+$lang = $lang + $lang_custom);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.