From 5ea79489af36d6c6e7e4a467ad1fdb2613b8ffcd Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Fri, 12 May 2017 07:19:06 +1000 Subject: [PATCH] pluck -> value This is an odd one from Laravel, pluck is now value and lists is now pluck. We'll need a release note about this one. --- modules/cms/classes/Theme.php | 4 ++-- modules/system/classes/VersionManager.php | 8 ++++++-- modules/system/reportwidgets/Status.php | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php index 1833d3730..8e7c29070 100644 --- a/modules/cms/classes/Theme.php +++ b/modules/cms/classes/Theme.php @@ -153,12 +153,12 @@ class Theme try { try { $dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function () { - return Parameter::applyKey(self::ACTIVE_KEY)->pluck('value'); + return Parameter::applyKey(self::ACTIVE_KEY)->value('value'); }); } catch (Exception $ex) { // Cache failed - $dbResult = Parameter::applyKey(self::ACTIVE_KEY)->pluck('value'); + $dbResult = Parameter::applyKey(self::ACTIVE_KEY)->value('value'); } } catch (Exception $ex) { diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php index 05576e27e..1e40beb7c 100644 --- a/modules/system/classes/VersionManager.php +++ b/modules/system/classes/VersionManager.php @@ -318,7 +318,7 @@ class VersionManager if (!isset($this->databaseVersions[$code])) { $this->databaseVersions[$code] = Db::table('system_plugin_versions') ->where('code', $code) - ->pluck('version') + ->value('version') ; } @@ -428,7 +428,11 @@ class VersionManager return $this->databaseHistory[$code]; } - $historyInfo = Db::table('system_plugin_history')->where('code', $code)->orderBy('id')->get(); + $historyInfo = Db::table('system_plugin_history') + ->where('code', $code) + ->orderBy('id') + ->get() + ->all(); return $this->databaseHistory[$code] = $historyInfo; } diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php index 488825291..a956526d4 100644 --- a/modules/system/reportwidgets/Status.php +++ b/modules/system/reportwidgets/Status.php @@ -61,7 +61,7 @@ class Status extends ReportWidgetBase $this->vars['coreBuild'] = Parameter::get('system::core.build'); $this->vars['eventLog'] = EventLog::count(); $this->vars['requestLog'] = RequestLog::count(); - $this->vars['appBirthday'] = PluginVersion::orderBy('created_at')->pluck('created_at'); + $this->vars['appBirthday'] = PluginVersion::orderBy('created_at')->value('created_at'); } public function onLoadWarningsForm()