pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2667 from wallabag/upgrade-symfony-32

Browse Source 
Upgrade to Symfony 3.2
This commit is contained in:
Nicolas Lœuillet
2016-12-15 22:18:45 +01:00
committed by GitHub
parent 15cc183850 6ad8aabb83
commit 24becc9717
13 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/ImportBundle/Controller/BrowserController.php
View File

@ -39,7 +39,7 @@ abstract class BrowserController extends Controller
$wallabag = $this->getImportService();
$wallabag->setUser($this->getUser());
if ($form->isValid()) {
if ($form->isSubmitted() && $form->isValid()) {
$file = $form->get('file')->getData();
$markAsRead = $form->get('mark_as_read')->getData();
$name = $this->getUser()->getId().'.json';

2
src/Wallabag/ImportBundle/Controller/InstapaperController.php
View File

@ -26,7 +26,7 @@ class InstapaperController extends Controller
$instapaper->setProducer($this->get('wallabag_import.producer.redis.instapaper'));
}
if ($form->isValid()) {
if ($form->isSubmitted() && $form->isValid()) {
$file = $form->get('file')->getData();
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'instapaper_'.$this->getUser()->getId().'.csv';

2
src/Wallabag/ImportBundle/Controller/PinboardController.php
View File

@ -26,7 +26,7 @@ class PinboardController extends Controller
$pinboard->setProducer($this->get('wallabag_import.producer.redis.pinboard'));
}
if ($form->isValid()) {
if ($form->isSubmitted() && $form->isValid()) {
$file = $form->get('file')->getData();
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'pinboard_'.$this->getUser()->getId().'.json';

2
src/Wallabag/ImportBundle/Controller/ReadabilityController.php
View File

@ -26,7 +26,7 @@ class ReadabilityController extends Controller
$readability->setProducer($this->get('wallabag_import.producer.redis.readability'));
}
if ($form->isValid()) {
if ($form->isSubmitted() && $form->isValid()) {
$file = $form->get('file')->getData();
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'readability_'.$this->getUser()->getId().'.json';

2
src/Wallabag/ImportBundle/Controller/WallabagController.php
View File

@ -40,7 +40,7 @@ abstract class WallabagController extends Controller
$wallabag = $this->getImportService();
$wallabag->setUser($this->getUser());
if ($form->isValid()) {
if ($form->isSubmitted() && $form->isValid()) {
$file = $form->get('file')->getData();
$markAsRead = $form->get('mark_as_read')->getData();
$name = $this->getUser()->getId().'.json';