diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-14 22:52:55 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-14 22:52:55 +0200 |
| commit | 81e4638f5a7b80d8c8339b1e32644fd234935f89 (patch) | |
| tree | fb2b6bc65811aab4e3aaef2ba2cc78b6826cfbd5 | |
| parent | 9c931008f9ac737aa4bd5512479cc22f4db95c20 (diff) | |
| parent | 635505eccef12db10ce708c9b9bab491b61f133e (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/freshrss into dev
| -rw-r--r-- | app/Controllers/usersController.php | 8 | ||||
| -rw-r--r-- | app/i18n/en.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php index fa967cedc..38b8f829b 100644 --- a/app/Controllers/usersController.php +++ b/app/Controllers/usersController.php @@ -17,7 +17,7 @@ class FreshRSS_users_Controller extends Minz_ActionController { if (Minz_Request::isPost()) { $ok = true; - $passwordPlain = Minz_Request::param('passwordPlain', false); + $passwordPlain = Minz_Request::param('passwordPlain', '', true); if ($passwordPlain != '') { Minz_Request::_param('passwordPlain'); //Discard plain-text password ASAP $_POST['passwordPlain'] = ''; @@ -32,7 +32,7 @@ class FreshRSS_users_Controller extends Minz_ActionController { } Minz_Session::_param('passwordHash', $this->view->conf->passwordHash); - $passwordPlain = Minz_Request::param('apiPasswordPlain', false); + $passwordPlain = Minz_Request::param('apiPasswordPlain', '', true); if ($passwordPlain != '') { if (!function_exists('password_hash')) { include_once(LIB_PATH . '/password_compat.php'); @@ -45,7 +45,7 @@ class FreshRSS_users_Controller extends Minz_ActionController { } if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { - $this->view->conf->_mail_login(Minz_Request::param('mail_login', false)); + $this->view->conf->_mail_login(Minz_Request::param('mail_login', '', true)); } $email = $this->view->conf->mail_login; Minz_Session::_param('mail', $email); @@ -119,7 +119,7 @@ class FreshRSS_users_Controller extends Minz_ActionController { } if ($ok) { - $passwordPlain = Minz_Request::param('new_user_passwordPlain', false); + $passwordPlain = Minz_Request::param('new_user_passwordPlain', '', true); $passwordHash = ''; if ($passwordPlain != '') { Minz_Request::_param('new_user_passwordPlain'); //Discard plain-text password ASAP diff --git a/app/i18n/en.php b/app/i18n/en.php index 223b74010..c0eb5a2bf 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -41,7 +41,7 @@ return array ( 'query_state_15' => 'Display all articles', 'query_number' => 'Query n°%d', 'add_query' => 'Add a query', - 'no_query' => 'You have not create user query yet.', + 'no_query' => 'You haven’t created user queries yet.', 'query_filter' => 'Filter applied:', 'no_query_filter' => 'No filter', 'about' => 'About', |