diff options
| author | 2013-09-14 19:44:53 +0200 | |
|---|---|---|
| committer | 2013-09-14 19:44:53 +0200 | |
| commit | 008d6a704748f04687ecf14f587b986d2fe5eacd (patch) | |
| tree | 284e081b27bd79dec046320b6ec14f498ac5f951 /app/controllers/feedController.php | |
| parent | 73fe0eabbe4461ba8c6d24692ca05de0ac93de11 (diff) | |
| parent | 7627970862e03a9061ddced3423689e9dccd6f45 (diff) | |
Merge branch 'SqlOptimisation' of https://github.com/Alkarex/FreshRSS into Alkarex-SqlOptimisation
Conflicts:
app/controllers/feedController.php
Diffstat (limited to 'app/controllers/feedController.php')
| -rwxr-xr-x | app/controllers/feedController.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index 8cb4c31c2..1131c3a7a 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -21,6 +21,7 @@ class feedController extends ActionController { $def_cat = $this->catDAO->getDefault (); $cat = $def_cat->id (); } + $user = Request::param ('username'); $pass = Request::param ('password'); $params = array (); |
