moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 17:42:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #737 from mariroz/dev

Browse Source 
fix of issue #677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters
This commit is contained in:
tcitworld 2014-06-25 19:33:28 +02:00
commit cdda041a90
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/3rdparty/makefulltextfeed.php vendored
View File

@ -671,7 +671,11 @@ foreach ($items as $key => $item) {
$html .= $item->get_description(); $html .= $item->get_description();
} else { } else {
$readability->clean($content_block, 'select'); $readability->clean($content_block, 'select');
if ($options->rewrite_relative_urls) makeAbsolute($effective_url, $content_block); // get base URL
$base_url = get_base_url($readability->dom);
if (!$base_url) $base_url = $effective_url;
// rewrite URLs
if ($options->rewrite_relative_urls) makeAbsolute($base_url, $content_block);
// footnotes // footnotes
if (($links == 'footnotes') && (strpos($effective_url, 'wikipedia.org') === false)) { if (($links == 'footnotes') && (strpos($effective_url, 'wikipedia.org') === false)) {
$readability->addFootnotes($content_block); $readability->addFootnotes($content_block);

10
inc/3rdparty/makefulltextfeedHelpers.php vendored
View File

@ -377,3 +377,13 @@ function debug($msg) {
flush(); flush();
} }
} }
function get_base_url($dom) {
$xpath = new DOMXPath($dom);
$base_url = @$xpath->evaluate('string(//head/base/@href)', $dom);
if ($base_url !== '') {
return $base_url;
} else {
return false;
}
}