From f4e60f105ae684f609781735effc82ce48327cca Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 7 Feb 2015 10:08:10 +1100
Subject: [PATCH] Prevents infinite loop with traceSql(), remember() is back

---
 UPGRADE.md                                 |  9 ++++-----
 composer.json                              |  4 ++--
 modules/system/ServiceProvider.php         |  2 +-
 modules/system/behaviors/SettingsModel.php | 10 +---------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 808da58ed..39cf26839 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -44,13 +44,12 @@ Optional things you can delete, if they do not contain anything custom.
 
 ### Things to do
 
-- Does config still inherit?
-- Does translation still inherit? Switch to our own?
-- Model->remember() replacement usage is buggy/broken
 - Custom Exception Handler needs attention
 - `laravel.log` should be renamed to system.log
 - Move storage/cache generated by CMS to storate/cms/cache
 - Fix clear cache command so it actually works
 - Fix unit tests
-- Consider creating a basic Controller since $router conflicts in CmsController
-- Search for `@todo L5`
\ No newline at end of file
+- Consider creating a basic Controller since $router conflicts in CmsController, or maybe avoiding conflict rename to $cmsRouter
+- Search for `@todo L5`
+- Dispatcher now native?
+- Cron queue type now native?
\ No newline at end of file
diff --git a/composer.json b/composer.json
index f5f50f70a..0636c1848 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,8 @@
     },
     "require": {
         "php": ">=5.4",
-        "laravel/framework": "5.0.*@dev",
-        "illuminate/html": "5.0.*@dev",
+        "laravel/framework": "5.0.*",
+        "illuminate/html": "5.0.*",
         "october/system": "~1.0",
         "october/backend": "~1.0",
         "october/cms": "~1.0",
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index f525235fa..c4d6f920e 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -111,7 +111,7 @@ class ServiceProvider extends ModuleServiceProvider
          * Write all log events to the database
          */
         Event::listen('illuminate.log', function ($level, $message, $context) {
-            if (!DbDongle::hasDatabase()) {
+            if (!DbDongle::hasDatabase() || defined('OCTOBER_NO_EVENT_LOGGING')) {
                 return;
             }
 
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 8d591f1d0..4e3742517 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -110,17 +110,9 @@ class SettingsModel extends ModelBehavior
      */
     public function getSettingsRecord()
     {
-        //
-        // @todo L5 disabled until bug is fixed
-        //
-        // $record = Cache::remember($this->getCacheKey(), 1440, function() {
-        //     return $this->model
-        //         ->where('item', $this->recordCode)
-        //         ->first();
-        // });
-
         $record = $this->model
             ->where('item', $this->recordCode)
+            ->remember(1440, $this->getCacheKey())
             ->first();
 
         return $record ?: null;