diff options
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 8 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/ContentProxy.php | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 8d2ac6d4..6018dfac 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -53,12 +53,10 @@ class EntryController extends Controller | |||
53 | 53 | ||
54 | /** | 54 | /** |
55 | * Fetch content and update entry. | 55 | * Fetch content and update entry. |
56 | * In case it fails, entry will return to avod loosing the data. | 56 | * In case it fails, $entry->getContent will return an error message. |
57 | * | 57 | * |
58 | * @param Entry $entry | 58 | * @param Entry $entry |
59 | * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded | 59 | * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded |
60 | * | ||
61 | * @return Entry | ||
62 | */ | 60 | */ |
63 | private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved') | 61 | private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved') |
64 | { | 62 | { |
@@ -68,7 +66,7 @@ class EntryController extends Controller | |||
68 | $message = 'flashes.entry.notice.'.$prefixMessage; | 66 | $message = 'flashes.entry.notice.'.$prefixMessage; |
69 | 67 | ||
70 | try { | 68 | try { |
71 | $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl()); | 69 | $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl()); |
72 | } catch (\Exception $e) { | 70 | } catch (\Exception $e) { |
73 | $this->get('logger')->error('Error while saving an entry', [ | 71 | $this->get('logger')->error('Error while saving an entry', [ |
74 | 'exception' => $e, | 72 | 'exception' => $e, |
@@ -79,8 +77,6 @@ class EntryController extends Controller | |||
79 | } | 77 | } |
80 | 78 | ||
81 | $this->get('session')->getFlashBag()->add('notice', $message); | 79 | $this->get('session')->getFlashBag()->add('notice', $message); |
82 | |||
83 | return $entry; | ||
84 | } | 80 | } |
85 | 81 | ||
86 | /** | 82 | /** |
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index 8ba77ca9..c73b8eaf 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php | |||
@@ -40,8 +40,6 @@ class ContentProxy | |||
40 | * @param Entry $entry Entry to update | 40 | * @param Entry $entry Entry to update |
41 | * @param string $url Url to grab content for | 41 | * @param string $url Url to grab content for |
42 | * @param array $content An array with AT LEAST keys title, html, url to skip the fetchContent from the url | 42 | * @param array $content An array with AT LEAST keys title, html, url to skip the fetchContent from the url |
43 | * | ||
44 | * @return Entry | ||
45 | */ | 43 | */ |
46 | public function updateEntry(Entry $entry, $url, array $content = []) | 44 | public function updateEntry(Entry $entry, $url, array $content = []) |
47 | { | 45 | { |
@@ -130,8 +128,6 @@ class ContentProxy | |||
130 | 'error_msg' => $e->getMessage(), | 128 | 'error_msg' => $e->getMessage(), |
131 | ]); | 129 | ]); |
132 | } | 130 | } |
133 | |||
134 | return $entry; | ||
135 | } | 131 | } |
136 | 132 | ||
137 | /** | 133 | /** |