Merge pull request #52 from rindeal/feature/speed-optimizations

Just some speed optimizations
getgrav · Sep 9, 2014 · e2021d1 · e2021d1
2 parents b50ec3f + ff3ebb1
commit e2021d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/system/src/Grav/Common/Config.php b/system/src/Grav/Common/Config.php
@@ -55,7 +55,7 @@ public function reload($force = true)
     {
         // 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
@@ -173,7 +173,7 @@ public function sortCollection(Collection $collection, $orderBy, $orderDir = 'as
     {
         $items = $collection->toArray();
 
-        $lookup = md5(serialize($items));
+        $lookup = md5(json_encode($items));
         if (!isset($this->sort[$lookup][$orderBy])) {
             $this->buildSort($lookup, $items, $orderBy, $orderManual);
         }

diff --git a/system/src/Grav/Common/TwigExtension.php b/system/src/Grav/Common/TwigExtension.php
@@ -126,7 +126,8 @@ public function randomizeFilter($original, $offset = 0)
         $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 {