diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
commit | e008c037f53324b931f027483f9f1053171109c5 (patch) | |
tree | 441c54eb946ffb53a161cad8f686ce7aff875abd /src/Wallabag/ImportBundle/Controller | |
parent | 74f39b0952440fa0c55e5e8a2e1a8d2bbd3acfd7 (diff) | |
parent | 79b9e49d9464e9a67f6ee66fbf6f6c541b1a29f4 (diff) | |
download | wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.gz wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.zst wallabag-e008c037f53324b931f027483f9f1053171109c5.zip |
Merge pull request #1612 from wallabag/v2-settings-page
Settings page
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller')
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/PocketController.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 7aee302f..1c1b4fa8 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php | |||
@@ -15,6 +15,7 @@ class PocketController extends Controller | |||
15 | { | 15 | { |
16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ | 16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ |
17 | 'import' => $this->get('wallabag_import.pocket.import'), | 17 | 'import' => $this->get('wallabag_import.pocket.import'), |
18 | 'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true, | ||
18 | ]); | 19 | ]); |
19 | } | 20 | } |
20 | 21 | ||