From e5037eb69b6d48b40cfc360a0584dacd5214deea Mon Sep 17 00:00:00 2001
From: Jan Chren <dev.rindeal@outlook.com>
Date: Fri, 5 Sep 2014 16:17:05 +0200
Subject: [PATCH 1/2] json_encode() is faster than serialize()

ref: http://stackoverflow.com/a/7723730/2566213
---
 system/src/Grav/Common/Config.php     | 2 +-
 system/src/Grav/Common/Page/Pages.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Config.php b/system/src/Grav/Common/Config.php
index df25af870..c3abf1311 100644
--- a/system/src/Grav/Common/Config.php
+++ b/system/src/Grav/Common/Config.php
@@ -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.
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 39a201d7a..9005ce911 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -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);
         }

From ff3ebb1f17a896ab309b1bf4a47d3c863a835b26 Mon Sep 17 00:00:00 2001
From: Jan Chren <dev.rindeal@outlook.com>
Date: Tue, 9 Sep 2014 02:05:19 +0200
Subject: [PATCH 2/2] calculate only once in loops

---
 system/src/Grav/Common/TwigExtension.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/TwigExtension.php b/system/src/Grav/Common/TwigExtension.php
index 82b0cdad3..43579020c 100644
--- a/system/src/Grav/Common/TwigExtension.php
+++ b/system/src/Grav/Common/TwigExtension.php
@@ -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 {