diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-06-15 15:55:44 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-06-15 15:55:44 +0200 |
| commit | 1863153b966af00078869b6634df1daa22cdcbfe (patch) | |
| tree | 72f8fb178fe5555f5d951253807033d1902af830 /app | |
| parent | 6d184ad1b8b84ab31e342f539844e0dc5738423b (diff) | |
Fix issue #71 : remise en place du mode endless + correction bug à l'importation OPML
Diffstat (limited to 'app')
| -rwxr-xr-x | app/controllers/feedController.php | 4 | ||||
| -rwxr-xr-x | app/controllers/indexController.php | 1 | ||||
| -rwxr-xr-x | app/views/helpers/pagination.phtml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index a41d7a33f..76da41c58 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -219,8 +219,8 @@ class feedController extends ActionController { $entryDAO = new EntryDAO (); $feedDAO = new FeedDAO (); - $categories = Request::param ('categories', array ()); - $feeds = Request::param ('feeds', array ()); + $categories = Request::param ('categories', array (), true); + $feeds = Request::param ('feeds', array (), true); // on ajoute les catégories en masse dans une fonction à part $this->addCategories ($categories); diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php index f4f0b98b3..5403b82ed 100755 --- a/app/controllers/indexController.php +++ b/app/controllers/indexController.php @@ -12,6 +12,7 @@ class indexController extends ActionController { View::appendScript (Url::display ('/scripts/shortcut.js')); View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main'))); View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'actualize'))); + View::appendScript (Url::display ('/scripts/endless_mode.js')); } $entryDAO = new EntryDAO (); diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index f029f281a..80c0976ad 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -8,7 +8,7 @@ <li class="item pager-next"> <?php if ($this->next != '') { ?> <?php $params[$getteur] = $this->next; ?> - <a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a> + <a id="load_more" href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a> <?php } else { ?> <?php echo Translate::t ('nothing_to_load'); ?> <?php } ?> |