From f0e253c8a9fab6d90402f41e9d3b111ad646de02 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 28 Aug 2018 04:45:52 +0700 Subject: [PATCH] remove unused salt in Model --- system/Model.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/system/Model.php b/system/Model.php index 7e5e6d69959c..679930319009 100644 --- a/system/Model.php +++ b/system/Model.php @@ -265,10 +265,9 @@ class Model * Model constructor. * * @param ConnectionInterface $db - * @param BaseConfig $config Config/App() * @param ValidationInterface $validation */ - public function __construct(ConnectionInterface &$db = null, BaseConfig $config = null, ValidationInterface $validation = null) + public function __construct(ConnectionInterface &$db = null, ValidationInterface $validation = null) { if ($db instanceof ConnectionInterface) { @@ -279,14 +278,6 @@ public function __construct(ConnectionInterface &$db = null, BaseConfig $config $this->db = Database::connect($this->DBGroup); } - if (is_null($config) || ! isset($config->salt)) - { - $config = config(\Config\App::class); - } - - $this->salt = $config->salt ?: ''; - unset($config); - $this->tempReturnType = $this->returnType; $this->tempUseSoftDeletes = $this->useSoftDeletes;