Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Revert "Small array merging optimization" #1770

Merged
merged 1 commit into from Dec 22, 2012
Jump to file or symbol
Failed to load files and symbols.
+3 −3
Split
@@ -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;
}
}