Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-05 22:30:23 +01:00
Code Issues Packages Projects Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Matias Griese
2019-03-11 14:35:44 +02:00
parent 8b4cac7ba6
commit 7f86f8eb6f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/src/Grav/Framework/Flex/Flex.php
View File

@@ -171,7 +171,7 @@ class Flex implements \Countable
// Normalize key and type using fallback to default type if it was set.
[$key, $type, $guess] = $this->resolveKeyAndType($flexKey, $defaultType);
if ($type === '') {
if ($type === '' && $types) {
// Add keys which are not associated to any Flex type. They will be included to every Flex type.
foreach ($types as $type => &$array) {
$array[] = $key;

6
system/src/Grav/Framework/Pagination/AbstractPagination.php
View File

@@ -48,7 +48,7 @@ class AbstractPagination implements PaginationInterface
protected $defaultOptions = [
'type' => 'page',
'limit' => 10,
'display' => 3,
'display' => 5,
'opening' => 0,
'ending' => 0,
'url' => null
@@ -186,8 +186,8 @@ class AbstractPagination implements PaginationInterface
// Make list like: 1 ... 4 5 6 ... 10
$range = range($this->pagesStart, $this->pagesStop);
$range[] = 1;
$range[] = $this->pages;
//$range[] = 1;
//$range[] = $this->pages;
natsort($range);
$range = array_unique($range);