Permalink
Browse files

Revert "Small array merging optimization"

This reverts commit bc57b93.
  • Loading branch information...
1 parent 89f4b9c commit 41273afa707ae12acf8c7ad1bff4600e0b1e4c5b Ian MacLennan committed Dec 22, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 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;
}
}

0 comments on commit 41273af

Please sign in to comment.