diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-22 09:36:50 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-22 09:36:50 +0100 |
commit | 6c32aaae95caf6fcd6740fa1a78f8af31bb6370f (patch) | |
tree | 87a1f573e7b405f34588a91f87b9196810cdaa7a /src/Wallabag/CoreBundle/Controller | |
parent | 9aa66d6244935fe86a5598fbdbe518cf6204af2e (diff) | |
parent | 23afdf3a70a5035cb58b76138a8627701ba55273 (diff) | |
download | wallabag-6c32aaae95caf6fcd6740fa1a78f8af31bb6370f.tar.gz wallabag-6c32aaae95caf6fcd6740fa1a78f8af31bb6370f.tar.zst wallabag-6c32aaae95caf6fcd6740fa1a78f8af31bb6370f.zip |
Merge pull request #1614 from wallabag/v2-few-fixes
Few fixes
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 d0cf91de..6c375909 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -125,7 +125,7 @@ class ConfigController extends Controller | |||
125 | $newUser->setEnabled(true); | 125 | $newUser->setEnabled(true); |
126 | $newUserForm = $this->createForm(NewUserType::class, $newUser, array( | 126 | $newUserForm = $this->createForm(NewUserType::class, $newUser, array( |
127 | 'validation_groups' => array('Profile'), | 127 | 'validation_groups' => array('Profile'), |
128 | 'action' => $this->generateUrl('config').'#set5', | 128 | 'action' => $this->generateUrl('config').'#set6', |
129 | )); | 129 | )); |
130 | $newUserForm->handleRequest($request); | 130 | $newUserForm->handleRequest($request); |
131 | 131 | ||
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 9dd904f1..3e1b512f 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -54,10 +54,10 @@ class EntryController extends Controller | |||
54 | if (false !== $existingEntry) { | 54 | if (false !== $existingEntry) { |
55 | $this->get('session')->getFlashBag()->add( | 55 | $this->get('session')->getFlashBag()->add( |
56 | 'notice', | 56 | 'notice', |
57 | 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y') | 57 | 'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y') |
58 | ); | 58 | ); |
59 | 59 | ||
60 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id']))); | 60 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); |
61 | } | 61 | } |
62 | 62 | ||
63 | $this->updateEntry($entry); | 63 | $this->updateEntry($entry); |