diff options
author | Alexandr Danilov <bitbucket@modos189.ru> | 2015-08-10 12:27:12 +0300 |
---|---|---|
committer | Alexandr Danilov <bitbucket@modos189.ru> | 2015-08-10 12:27:12 +0300 |
commit | 4919584b8758b23e127536b686776c1c41b3d215 (patch) | |
tree | 80288df2d6588fd84d0d028fe0ea652131a48c9a /src/Wallabag/CoreBundle/Service | |
parent | 946d6a512470613aa5ffa556b6547397064dd89f (diff) | |
parent | 47cadf36c8f7c20ba1edf26e184637d33a52cf35 (diff) | |
download | wallabag-4919584b8758b23e127536b686776c1c41b3d215.tar.gz wallabag-4919584b8758b23e127536b686776c1c41b3d215.tar.zst wallabag-4919584b8758b23e127536b686776c1c41b3d215.zip |
Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
# src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
Diffstat (limited to 'src/Wallabag/CoreBundle/Service')
-rw-r--r-- | src/Wallabag/CoreBundle/Service/Extractor.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Service/Extractor.php b/src/Wallabag/CoreBundle/Service/Extractor.php index 6d43a1da..961ac20a 100644 --- a/src/Wallabag/CoreBundle/Service/Extractor.php +++ b/src/Wallabag/CoreBundle/Service/Extractor.php | |||
@@ -10,7 +10,7 @@ final class Extractor | |||
10 | public static function extract($url) | 10 | public static function extract($url) |
11 | { | 11 | { |
12 | $pageContent = self::getPageContent(new Url(base64_encode($url))); | 12 | $pageContent = self::getPageContent(new Url(base64_encode($url))); |
13 | $title = $pageContent['rss']['channel']['item']['title'] ?: 'Untitled'; | 13 | $title = $pageContent['rss']['channel']['item']['title'] ?: parse_url($url, PHP_URL_HOST); |
14 | $body = $pageContent['rss']['channel']['item']['description']; | 14 | $body = $pageContent['rss']['channel']['item']['description']; |
15 | 15 | ||
16 | $content = new Content(); | 16 | $content = new Content(); |