Revert "Small array merging optimization"

This reverts commit bc57b93.
chrisdavenport · Dec 22, 2012 · 41273af · 41273af
1 parent 89f4b9c
commit 41273af
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php
@@ -762,19 +762,19 @@ protected function loadLanguage($filename, $extension = 'unknown')
 
 		if (file_exists($filename))
 		{
-			$strings = ksort($this->parse($filename),SORT_STRING);
+			$strings = $this->parse($filename);
 		}
 
 		if ($strings)
 		{
 			if (is_array($strings))
 			{
-				$this->strings = ksort(array_merge($this->strings, $strings),SORT_STRING);
+				$this->strings = array_merge($this->strings, $strings);
 			}
 
 			if (is_array($strings) && count($strings))
 			{
-				$this->strings = ksort(array_merge($this->strings, $this->override),SORT_STRING);
+				$this->strings = array_merge($this->strings, $this->override);
 				$result = true;
 			}
 		}