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

Fixed Flex Pages with 00.home page not having ordering set

Browse Source
This commit is contained in:
Matias Griese
2020-04-24 13:30:10 +03:00
parent dfa8ce1ad4
commit a9d80d73d6
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@
* Fixed user avatar creation for new `Flex Users` when using folder storage
* Fixed `Trying to access array offset on value of type null` PHP 7.4 error in `Plugin.php`
* Fixed Gregwar Image library using `.jpeg` for cached images, rather use `.jpg`
* Fixed `Flex Pages` with `00.home` page not having ordering set
# v1.7.0-rc.8
## 03/19/2020

10
system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php
View File

@@ -139,9 +139,9 @@ class PageStorage extends FolderStorage
if ($key !== '') {
$key .= '/';
}
$order = $keys['order'] ?? 0;
$order = $keys['order'] ?? null;
$folder = $keys['folder'] ?? 'undefined';
$key .= $order ? sprintf('%02d.%s', $order, $folder) : $folder;
$key .= is_numeric($order) ? sprintf('%02d.%s', $order, $folder) : $folder;
}
$params = $includeParams ? $this->buildStorageKeyParams($keys) : '';
@@ -212,7 +212,7 @@ class PageStorage extends FolderStorage
$storageKey = $row['storage_key'] ?? $meta['storage_key'] ?? '';
$keyMeta = $storageKey !== '' ? $this->extractKeysFromStorageKey($storageKey) : null;
$parentKey = $row['parent_key'] ?? $meta['parent_key'] ?? $keyMeta['parent_key'] ?? '';
$order = $row['order'] ?? $meta['order'] ?? $keyMeta['order'] ?? '';
$order = $row['order'] ?? $meta['order'] ?? $keyMeta['order'] ?? null;
$folder = $row['folder'] ?? $meta['folder'] ?? $keyMeta['folder'] ?? '';
$template = $row['template'] ?? $meta['template'] ?? $keyMeta['template'] ?? '';
$lang = $row['lang'] ?? $meta['lang'] ?? $keyMeta['lang'] ?? '';
@@ -232,7 +232,7 @@ class PageStorage extends FolderStorage
'key' => null,
'params' => null,
'parent_key' => $parentKey,
'order' => (int)$order,
'order' => is_numeric($order) ? (int)$order : null,
'folder' => $folder,
'template' => $template,
'lang' => $lang
@@ -271,7 +271,7 @@ class PageStorage extends FolderStorage
'key' => $key,
'params' => $params,
'parent_key' => $parentKey,
'order' => (int)$order,
'order' => is_numeric($order) ? (int)$order : null,
'folder' => $folder,
'template' => $template,
'lang' => $language

12
system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php
View File

@@ -339,13 +339,15 @@ trait PageContentTrait
$value = $order[1] ?? false;
}
$value = (int)$value;
if ($value !== false) {
$value = (int)$value;
}
return $value ?: false;
return $value;
}
);
return $property ? sprintf('%02d.', $property) : false;
return $property !== false ? sprintf('%02d.', $property) : false;
}
/**
@@ -547,11 +549,11 @@ trait PageContentTrait
case 'content':
return $this->getProperty('markdown');
case 'order':
return ((int)$this->order()) ?: '';
return (string)$this->order();
case 'menu':
return $this->menu();
case 'ordering':
return (bool)$this->order();
return $this->order() !== false ? '1' : '0';
case 'folder':
$folder = $this->folder();

1
system/src/Grav/Framework/Route/RouteFactory.php
View File

@@ -78,6 +78,7 @@ class RouteFactory
'params' => static::getParams($path)
],
];
return new Route($parts);
}