Merge pull request #1235 from nextcloud/issue-1192-move-navigation-entries-without-order-to-the-end

Move navigation entries without order to the end
This commit is contained in:
Morris Jobke 2016-09-06 14:12:01 +02:00 committed by GitHub
commit 45a84f3623

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;
}