From 899100919d05c2df8769dde7158dd8d397316f5b Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 4 Feb 2015 19:52:59 +1100
Subject: [PATCH] Rewrite all implementations of remember() on models

---
 modules/backend/behaviors/UserPreferencesModel.php | 11 ++++++++---
 modules/cms/classes/Theme.php                      |  7 +++----
 modules/system/behaviors/SettingsModel.php         | 10 ++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/modules/backend/behaviors/UserPreferencesModel.php b/modules/backend/behaviors/UserPreferencesModel.php
index a28f5468a..196f5d3c3 100644
--- a/modules/backend/behaviors/UserPreferencesModel.php
+++ b/modules/backend/behaviors/UserPreferencesModel.php
@@ -1,5 +1,6 @@
 <?php namespace Backend\Behaviors;
 
+use Cache;
 use System\Behaviors\SettingsModel;
 use Backend\Models\UserPreferences;
 
@@ -62,9 +63,13 @@ class UserPreferencesModel extends SettingsModel
     public function getSettingsRecord()
     {
         $item = UserPreferences::forUser();
-        $record = $item->scopeFindRecord($this->model, $this->recordCode, $item->userContext)
-            ->remember(1440, $this->getCacheKey())
-            ->first();
+        $record = Cache::remember($this->getCacheKey(), 1440, function() use ($item) {
+            return $item->scopeFindRecord(
+                $this->model,
+                $this->recordCode,
+                $item->userContext
+            )->first();
+        });
 
         return $record ?: null;
     }
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 43ddf3b66..9e5f98351 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -129,10 +129,9 @@ class Theme
         $activeTheme = Config::get('cms.activeTheme');
 
         if (DbDongle::hasDatabase()) {
-            $dbResult = Parameters::findRecord(self::ACTIVE_KEY)
-                ->remember(1440, self::ACTIVE_KEY)
-                ->pluck('value')
-            ;
+            $dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function() {
+                return Parameters::findRecord(self::ACTIVE_KEY)->pluck('value');
+            });
 
             if ($dbResult !== null && static::exists($dbResult)) {
                 $activeTheme = $dbResult;
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 4e3742517..a329c7579 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -110,10 +110,12 @@ class SettingsModel extends ModelBehavior
      */
     public function getSettingsRecord()
     {
-        $record = $this->model
-            ->where('item', $this->recordCode)
-            ->remember(1440, $this->getCacheKey())
-            ->first();
+
+        $record = Cache::remember($this->getCacheKey(), 1440, function() {
+            return $this->model
+                ->where('item', $this->recordCode)
+                ->first();
+        });
 
         return $record ?: null;
     }