fix: an intended merge implementation

which might bring unwanted return in
certain circumstances
A-dev
Anankke 8 years ago
parent 25109792f7
commit 7e55cc37ff

@ -244,7 +244,7 @@ class URL
return $return_url;
}
if (Config::get('mergeSub') == 'true') {
$items = self::getAllItems($user, 1, $is_ss) + self::getAllItems($user, 0, $is_ss);
$items = array_merge(self::getAllItems($user, 1, $is_ss), self::getAllItems($user, 0, $is_ss));
} else {
$items = self::getAllItems($user, $is_mu, $is_ss);
}

Loading…
Cancel
Save