oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-02 16:38:38 +00:00
Code Wiki Activity

Imported entries which fail to fetch get standard error body

Browse source
This commit is contained in:
Jerome Charaoui 2016-12-02 22:42:36 -05:00
parent 29dca43236
commit 36e6ef52a1
5 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -63,7 +63,7 @@ class ContentProxy
$html = $content['html']; $html = $content['html'];
if (false === $html) { if (false === $html) {
$html = '<p>Unable to retrieve readable content.</p>'; $html = $this->fetchingErrorMessage;
if (isset($content['open_graph']['og_description'])) { if (isset($content['open_graph']['og_description'])) {
$html .= '<p><i>But we found a short description: </i></p>'; $html .= '<p><i>But we found a short description: </i></p>';

2
src/Wallabag/ImportBundle/Import/ChromeImport.php
View file

@ -37,7 +37,7 @@ class ChromeImport extends BrowserImport
{ {
$data = [ $data = [
'title' => $entry['name'], 'title' => $entry['name'],
'html' => '', 'html' => false,
'url' => $entry['url'], 'url' => $entry['url'],
'is_archived' => $this->markAsRead, 'is_archived' => $this->markAsRead,
'tags' => '', 'tags' => '',

2
src/Wallabag/ImportBundle/Import/FirefoxImport.php
View file

@ -37,7 +37,7 @@ class FirefoxImport extends BrowserImport
{ {
$data = [ $data = [
'title' => $entry['title'], 'title' => $entry['title'],
'html' => '', 'html' => false,
'url' => $entry['uri'], 'url' => $entry['uri'],
'is_archived' => $this->markAsRead, 'is_archived' => $this->markAsRead,
'tags' => '', 'tags' => '',

1
src/Wallabag/ImportBundle/Import/InstapaperImport.php
View file

@ -76,6 +76,7 @@ class InstapaperImport extends AbstractImport
'is_starred' => $data[3] === 'Starred', 'is_starred' => $data[3] === 'Starred',
'content_type' => '', 'content_type' => '',
'language' => '', 'language' => '',
'html' => false,
]; ];
} }
fclose($handle); fclose($handle);

1
src/Wallabag/ImportBundle/Import/ReadabilityImport.php
View file

@ -103,6 +103,7 @@ class ReadabilityImport extends AbstractImport
'is_archived' => $importedEntry['archive'] || $this->markAsRead, 'is_archived' => $importedEntry['archive'] || $this->markAsRead,
'is_starred' => $importedEntry['favorite'], 'is_starred' => $importedEntry['favorite'],
'created_at' => $importedEntry['date_added'], 'created_at' => $importedEntry['date_added'],
'html' => false,
]; ];
$entry = new Entry($this->user); $entry = new Entry($this->user);