[Gforge-commits] tools language_file_merger.php,1.3,1.4

[gsmet]

Update of /cvsroot/gforge/tools
In directory db.perdue.net:/tmp/cvs-serv23104

Modified Files:
        language_file_merger.php 
Log Message:
result array is now sorted correctly


Index: language_file_merger.php
===================================================================
RCS file: /cvsroot/gforge/tools/language_file_merger.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- language_file_merger.php    3 Mar 2004 10:41:56 -0000       1.3
+++ language_file_merger.php    3 Mar 2004 11:16:24 -0000       1.4
@@ -25,8 +25,8 @@
        exit;
 }
 
-$baseContent = getLanguageAsArray($baseFile);
-$targetContent = getLanguageAsArray($targetFile);
+$baseContent =& getLanguageAsArray($baseFile);
+$targetContent =& getLanguageAsArray($targetFile);
 
 reset($baseContent);
 $resultContent = array();
@@ -61,7 +61,7 @@
 unset($targetContent);
 unset($baseContent);
 
-ksort($resultContent);
+arraySort($resultContent);
 reset($resultContent);
 
 foreach($resultContent AS $pageName => $page) {
@@ -84,7 +84,7 @@
 <?php
 }
 
-function getLanguageAsArray($languageFile) {
+function &getLanguageAsArray($languageFile) {
        $content = file($languageFile);
        reset($content);
        $result = array();
@@ -108,4 +108,13 @@
        }
        return $result;
 }
+
+function &arraySort(& $array) {
+       $keys = array_keys($array);
+       for($i = 0, $count = count($keys); $i < $count; $i++) {
+               ksort($array[$keys[$i]]);
+       }
+       ksort($array);
+}
+
 ?>