Add app.name config

Various other refittings
This commit is contained in:
Samuel Georges 2017-05-16 18:50:41 +10:00
parent 671f23e284
commit 7e76f39e6c
4 changed files with 14 additions and 4 deletions

View File

@ -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

View File

@ -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
);

View File

@ -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 ', ')")

View File

@ -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,