From 7e76f39e6c6d8793472d97e3b409f68551b09cb4 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 16 May 2017 18:50:41 +1000
Subject: [PATCH] Add app.name config Various other refittings

---
 config/app.php                         | 12 ++++++++++++
 modules/backend/classes/Controller.php |  3 +--
 modules/backend/widgets/Lists.php      |  2 +-
 modules/system/providers.php           |  1 -
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/config/app.php b/config/app.php
index 87cc0b602..7e6474bc7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -18,6 +18,18 @@ return [
 
     'debug' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Name
+    |--------------------------------------------------------------------------
+    |
+    | This value is the name of your application. This value is used when the
+    | framework needs to place the application's name in a notification or
+    | any other location as required by the application or its packages.
+    */
+
+    'name' => 'October CMS',
+
     /*
     |--------------------------------------------------------------------------
     | Application URL
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index b8c82c176..b38417fb4 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -1,7 +1,6 @@
 <?php namespace Backend\Classes;
 
 use App;
-use Str;
 use Lang;
 use View;
 use Flash;
@@ -704,7 +703,7 @@ class Controller extends Extendable
 
         $token = Request::input('_token') ?: Request::header('X-CSRF-TOKEN');
 
-        return Str::equals(
+        return hash_equals(
             Session::getToken(),
             $token
         );
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 31f6d7c61..df8fc5feb 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -452,7 +452,7 @@ class Lists extends WidgetBase
                  * Manipulate a count query for the sub query
                  */
                 $relationObj = $this->model->{$column->relation}();
-                $countQuery = $relationObj->getRelationCountQuery($relationObj->getRelated()->newQueryWithoutScopes(), $query);
+                $countQuery = $relationObj->getRelationExistenceQuery($relationObj->getRelated()->newQueryWithoutScopes(), $query);
 
                 $joinSql = $this->isColumnRelated($column, true)
                     ? DbDongle::raw("group_concat(" . $sqlSelect . " separator ', ')")
diff --git a/modules/system/providers.php b/modules/system/providers.php
index 31ea6e7b0..bb395888e 100644
--- a/modules/system/providers.php
+++ b/modules/system/providers.php
@@ -25,7 +25,6 @@ return [
     /*
      * October Rain providers
      */
-    October\Rain\Foundation\Providers\ArtisanServiceProvider::class,
     October\Rain\Database\DatabaseServiceProvider::class,
     October\Rain\Halcyon\HalcyonServiceProvider::class,
     October\Rain\Filesystem\FilesystemServiceProvider::class,