mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1299 from nextcloud/stable10-backport-1235 

[stable10] Move navigation entries without order to the end
This commit is contained in:
Morris Jobke 2016-09-07 13:41:22 +02:00 committed by GitHub
parent 8324b6492d 27f7416519
commit 2880a08747
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/legacy/app.php
View File

@ -508,7 +508,15 @@ class OC_App {
}
unset($navEntry);
usort($list, create_function('$a, $b', 'if( $a["order"] == $b["order"] ) {return 0;}elseif( $a["order"] < $b["order"] ) {return -1;}else{return 1;}'));
usort($list, function($a, $b) {
if (isset($a['order']) && isset($b['order'])) {
return ($a['order'] < $b['order']) ? -1 : 1;
} else if (isset($a['order']) || isset($b['order'])) {
return isset($a['order']) ? -1 : 1;
} else {
return ($a['name'] < $b['name']) ? -1 : 1;
}
});
return $list;
}