diff options
author | Joey3000 <Joey3000@users.noreply.github.com> | 2015-09-07 17:15:54 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-10-06 18:25:26 +0300 |
commit | 96d7483edf1185b565c99250b3abf3c303be624c (patch) | |
tree | fad39f98df945f5101aadb6344388ce50902e95c /plugins/Login/Controller.php | |
parent | fe7cfa8038fe9e74d42c791d1e6d5b5948e10fe5 (diff) |
Piwik\Plugins\Login\Controller class: Change private members to protected
To the Piwik\Plugins\Login\Controller class: This change is to prevent extending classes (third-party login plugins reusing the core Login plugin implementation) from having to copy-paste \Login\Controller code which, if declared "private" cannot be part of the child class.
Please refer to https://github.com/piwik/piwik/pull/8681 for details - that PR, which is an exact copy, was merged into the Piwik 2.x branch, but then reverted to not break existing plugins. It was decided to do that on the 3.x branch instead, which this PR does.
Diffstat (limited to 'plugins/Login/Controller.php')
-rw-r--r-- | plugins/Login/Controller.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 0bdb864e96..bb9e5da77b 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -31,17 +31,17 @@ class Controller extends \Piwik\Plugin\Controller /** * @var PasswordResetter */ - private $passwordResetter; + protected $passwordResetter; /** * @var Auth */ - private $auth; + protected $auth; /** * @var SessionInitializer */ - private $sessionInitializer; + protected $sessionInitializer; /** * Constructor. @@ -124,7 +124,7 @@ class Controller extends \Piwik\Plugin\Controller * * @param View $view */ - private function configureView($view) + protected function configureView($view) { $this->setBasicVariablesView($view); @@ -261,7 +261,7 @@ class Controller extends \Piwik\Plugin\Controller * @param QuickForm2 $form * @return array Error message(s) if an error occurs. */ - private function resetPasswordFirstStep($form) + protected function resetPasswordFirstStep($form) { $loginMail = $form->getSubmitValue('form_login'); $password = $form->getSubmitValue('form_password'); |