diff options
author | Kevin Decherf <kevin@kdecherf.com> | 2017-11-26 23:20:23 +0100 |
---|---|---|
committer | Kevin Decherf <kevin@kdecherf.com> | 2017-12-13 22:44:31 +0100 |
commit | af29e1bf07aabaa6a4e4653c1a3b5c10ce831bb6 (patch) | |
tree | b4e0a8e01717f3d8d96138033bf8ce1696a127a7 /src/Wallabag/ApiBundle/Controller/EntryRestController.php | |
parent | 70265817aee257e7e635eda79ce3e037e3b4a242 (diff) | |
download | wallabag-af29e1bf07aabaa6a4e4653c1a3b5c10ce831bb6.tar.gz wallabag-af29e1bf07aabaa6a4e4653c1a3b5c10ce831bb6.tar.zst wallabag-af29e1bf07aabaa6a4e4653c1a3b5c10ce831bb6.zip |
Fix empty title and domain_name when exception is thrown during fetch
Add a new helper to set a default title when it's empty:
1/ use basename part of entry's path, if any
2/ or use domain name
Fixes #2053
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
Diffstat (limited to 'src/Wallabag/ApiBundle/Controller/EntryRestController.php')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/EntryRestController.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php index 7d820c7e..acca219f 100644 --- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php | |||
@@ -381,6 +381,14 @@ class EntryRestController extends WallabagRestController | |||
381 | } | 381 | } |
382 | } | 382 | } |
383 | 383 | ||
384 | if (empty($entry->getDomainName())) { | ||
385 | $this->get('wallabag_core.content_proxy')->setEntryDomainName($entry); | ||
386 | } | ||
387 | |||
388 | if (empty($entry->getTitle())) { | ||
389 | $this->get('wallabag_core.content_proxy')->setDefaultEntryTitle($entry); | ||
390 | } | ||
391 | |||
384 | $em = $this->getDoctrine()->getManager(); | 392 | $em = $this->getDoctrine()->getManager(); |
385 | $em->persist($entry); | 393 | $em->persist($entry); |
386 | $em->flush(); | 394 | $em->flush(); |
@@ -490,6 +498,14 @@ class EntryRestController extends WallabagRestController | |||
490 | $entry->setOriginUrl($data['origin_url']); | 498 | $entry->setOriginUrl($data['origin_url']); |
491 | } | 499 | } |
492 | 500 | ||
501 | if (empty($entry->getDomainName())) { | ||
502 | $this->get('wallabag_core.content_proxy')->setEntryDomainName($entry); | ||
503 | } | ||
504 | |||
505 | if (empty($entry->getTitle())) { | ||
506 | $this->get('wallabag_core.content_proxy')->setDefaultEntryTitle($entry); | ||
507 | } | ||
508 | |||
493 | $em = $this->getDoctrine()->getManager(); | 509 | $em = $this->getDoctrine()->getManager(); |
494 | $em->persist($entry); | 510 | $em->persist($entry); |
495 | $em->flush(); | 511 | $em->flush(); |