aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-07-09 19:45:27 +0200
committerThomas Citharel <tcit@tcit.fr>2017-07-09 19:45:27 +0200
commit881c257662b4ff66a527331e94ca4c508f86936b (patch)
treee6de599e64c97b39a59955f937a3b7b7096de58d
parent9a62cb9fa4e1fa401a5b1604283eabc4b665a3b7 (diff)
downloadwallabag-rss2atom.tar.gz
wallabag-rss2atom.tar.zst
wallabag-rss2atom.zip
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
-rw-r--r--src/Wallabag/CoreBundle/Controller/FeedController.php2
-rw-r--r--src/Wallabag/UserBundle/Repository/UserRepository.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php
index ab1e61ad..7e89afee 100644
--- a/src/Wallabag/CoreBundle/Controller/FeedController.php
+++ b/src/Wallabag/CoreBundle/Controller/FeedController.php
@@ -193,7 +193,7 @@ class FeedController extends Controller
193 $entries->setCurrentPage((int) $page); 193 $entries->setCurrentPage((int) $page);
194 } catch (OutOfRangeCurrentPageException $e) { 194 } catch (OutOfRangeCurrentPageException $e) {
195 if ($page > 1) { 195 if ($page > 1) {
196 return $this->redirect($url.'/'.$entries->getNbPages()); 196 return $this->redirect($url . '/' . $entries->getNbPages());
197 } 197 }
198 } 198 }
199 199
diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php
index e2bc76c3..fa42065e 100644
--- a/src/Wallabag/UserBundle/Repository/UserRepository.php
+++ b/src/Wallabag/UserBundle/Repository/UserRepository.php
@@ -11,8 +11,8 @@ class UserRepository extends EntityRepository
11 * 11 *
12 * @param string $username 12 * @param string $username
13 * @param string $feedToken 13 * @param string $feedToken
14 * @return null|User
15 * 14 *
15 * @return null|User
16 */ 16 */
17 public function findOneByUsernameAndFeedtoken($username, $feedToken) 17 public function findOneByUsernameAndFeedtoken($username, $feedToken)
18 { 18 {