Skip to content
This repository has been archived by the owner on Nov 26, 2017. It is now read-only.

Revert "Small array merging optimization" #1770

Merged
merged 1 commit into from
Dec 22, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/joomla/language/language.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -762,19 +762,19 @@ protected function loadLanguage($filename, $extension = 'unknown')


if (file_exists($filename)) if (file_exists($filename))
{ {
$strings = ksort($this->parse($filename),SORT_STRING); $strings = $this->parse($filename);
} }


if ($strings) if ($strings)
{ {
if (is_array($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)) 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; $result = true;
} }
} }
Expand Down