diff options
author | Andrey Andreev <narf@devilix.net> | 2016-12-14 17:14:35 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-12-14 17:14:35 +0100 |
commit | dcd6f5153b7e7e6d798d5a77af65b7460f152e5c (patch) | |
tree | 3f52a8b24fe55aeaf29f6cdb6dfa5b6e9f2ac095 /system/core/Input.php | |
parent | 24c866628d0ce5463d7e8b4eba512fa9e7752dfd (diff) |
Isolate CI_Security instantiation from CI_Input; improve tests
Diffstat (limited to 'system/core/Input.php')
-rw-r--r-- | system/core/Input.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index aefc3b7d8..d881e253d 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -113,11 +113,10 @@ class CI_Input { * * @return void */ - public function __construct() + public function __construct(CI_Security &$security) { - $this->_enable_csrf = (config_item('csrf_protection') === TRUE); - - $this->security =& load_class('Security', 'core'); + $this->_enable_csrf = (config_item('csrf_protection') === TRUE); + $this->security = $security; // CSRF Protection check if ($this->_enable_csrf === TRUE && ! is_cli()) |