diff options
| author |  Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2015-07-23 11:59:32 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2015-07-23 11:59:32 +0200 |
| commit | de607efd6ae1dc68ce56e482ff6e88d08e8242f4 (patch) | |
| tree | 5708d4ddd2768e8df3e7ba2c5cb71ab5131b75ff /app/Controllers/subscriptionController.php | |
| parent | cd83002f430d573fc3757de3f4204d911bcb7183 (diff) | |
| parent | d2caf4349c4c5957ddc453795ffe8ea10237231c (diff) | |
Merge branch 'FreshRSS/dev' into dev
Diffstat (limited to 'app/Controllers/subscriptionController.php')
| -rw-r--r-- | app/Controllers/subscriptionController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 333565faf..03d3ee15e 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -77,11 +77,11 @@ class FreshRSS_subscription_Controller extends Minz_ActionController { Minz_View::prependTitle(_t('sub.title.feed_management') . ' · ' . $this->view->feed->name() . ' · '); if (Minz_Request::isPost()) { - $user = Minz_Request::param('http_user', ''); - $pass = Minz_Request::param('http_pass', ''); + $user = trim(Minz_Request::param('http_user_feed' . $id, '')); + $pass = Minz_Request::param('http_pass_feed' . $id, ''); $httpAuth = ''; - if ($user != '' || $pass != '') { + if ($user != '' && $pass != '') { //TODO: Sanitize $httpAuth = $user . ':' . $pass; } |