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

Merge branch 'develop' into feature/gpm

Browse Source
This commit is contained in:
Djamil Legato
2014-09-08 22:41:04 -07:00
parent 04fb7326e5 e2021d1075
commit fd64fd0822
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/src/Grav/Common/Config.php
View File

@@ -55,7 +55,7 @@ class Config extends Data
{
// Build file map.
$files = $this->build();
$key = md5(serialize($files) . GRAV_VERSION);
$key = md5(json_encode($files) . GRAV_VERSION);
if ($force || $key != $this->key) {
// First take non-blocking lock to the file.

2
system/src/Grav/Common/Page/Pages.php
View File

@@ -173,7 +173,7 @@ class Pages
{
$items = $collection->toArray();
$lookup = md5(serialize($items));
$lookup = md5(json_encode($items));
if (!isset($this->sort[$lookup][$orderBy])) {
$this->buildSort($lookup, $items, $orderBy, $orderManual);
}

3
system/src/Grav/Common/TwigExtension.php
View File

@@ -126,7 +126,8 @@ class TwigExtension extends \Twig_Extension
$random = array_slice($original, $offset);
shuffle($random);
for ($x=0; $x < sizeof($original); $x++) {
$sizeOf = sizeof($original);
for ($x=0; $x < $sizeOf; $x++) {
if ($x < $offset) {
$sorted[] = $original[$x];
} else {