diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-01 13:51:35 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-01 13:51:35 +0100 |
commit | e43d27f8450dcdf79850e935b762ac390a19dd63 (patch) | |
tree | dcdf7ba59559665421181e895137ddb04fc985fc /src/Wallabag/CoreBundle/Controller | |
parent | 74d8afa5fa38af083bbacc63d76b904c01808f14 (diff) | |
parent | 5f8a785719c1dfeacc0bccc0781a94bd396b80ff (diff) | |
download | wallabag-e43d27f8450dcdf79850e935b762ac390a19dd63.tar.gz wallabag-e43d27f8450dcdf79850e935b762ac390a19dd63.tar.zst wallabag-e43d27f8450dcdf79850e935b762ac390a19dd63.zip |
Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight
[#1604] First draft to fix SensioLabsInsight report
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 6c375909..b01aaa7f 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -198,7 +198,7 @@ class ConfigController extends Controller | |||
198 | * | 198 | * |
199 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 199 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
200 | */ | 200 | */ |
201 | public function deleteTaggingRule(TaggingRule $rule) | 201 | public function deleteTaggingRuleAction(TaggingRule $rule) |
202 | { | 202 | { |
203 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { | 203 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { |
204 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); | 204 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 3e1b512f..ea77d138 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; | |||
9 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
11 | use Wallabag\CoreBundle\Entity\Entry; | 11 | use Wallabag\CoreBundle\Entity\Entry; |
12 | use Wallabag\CoreBundle\Filter\EntryFilterType; | 12 | use Wallabag\CoreBundle\Form\Type\EntryFilterType; |
13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; | 13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; |
14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; | 14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; |
15 | 15 | ||
@@ -81,7 +81,7 @@ class EntryController extends Controller | |||
81 | * | 81 | * |
82 | * @return \Symfony\Component\HttpFoundation\Response | 82 | * @return \Symfony\Component\HttpFoundation\Response |
83 | */ | 83 | */ |
84 | public function addEntryViaBookmarklet(Request $request) | 84 | public function addEntryViaBookmarkletAction(Request $request) |
85 | { | 85 | { |
86 | $entry = new Entry($this->getUser()); | 86 | $entry = new Entry($this->getUser()); |
87 | $entry->setUrl($request->get('url')); | 87 | $entry->setUrl($request->get('url')); |