Skip to content
New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix natural sort when > 100 pages #1564

Merged
merged 3 commits into from
Jul 12, 2017
Merged

Fix natural sort when > 100 pages #1564

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
208c985
Fix natural sort when > 100 pages
w00fz Jul 10, 2017
7dd6b5b
Revert manual and default sort type
w00fz Jul 10, 2017
2fbe577
Only check prefix numbers
w00fz Jul 11, 2017
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
Next Next commit
Fix natural sort when > 100 pages
  • Loading branch information
@w00fz
w00fz authored Jul 10, 2017
commit 208c985ca0cdb1b469de01c9fcd09cbceb9eaccd
8 changes: 7 additions & 1 deletion system/src/Grav/Common/Page/Pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
case 'default':
default:
$list[$key] = $key;
$sort_flags = $sort_flags ?: SORT_REGULAR;
$sort_flags = $sort_flags ?: SORT_NATURAL | SORT_FLAG_CASE;
}
}

Expand All @@ -1257,6 +1257,12 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
$locale = setlocale(LC_COLLATE, 0); //`setlocale` with a 0 param returns the current locale set
$col = Collator::create($locale);
if ($col) {
if (($sort_flags & SORT_NATURAL) === SORT_NATURAL) {
$list = preg_replace_callback('~([0-9]+)~', function($number) {
return sprintf('%032d', $number);
}, $list);
}

$col->asort($list, $sort_flags);
} else {
asort($list, $sort_flags);
Expand Down