Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1770 from ianmacl/revert_jtext

Revert "Small array merging optimization"
  • Loading branch information...
commit 397eb9f1881ead016bc489cd9d4f112630c82d69 2 parents 1071080 + 41273af
Sam Moffatt pasamio authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 libraries/joomla/language/language.php
6 libraries/joomla/language/language.php
View
@@ -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;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.