aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Models/Entry.php4
-rw-r--r--lib/lib_phpQuery.php2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 48db5f5c6..f488f5d8d 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -508,6 +508,10 @@ class FreshRSS_Entry extends Minz_Model {
* @var phpQueryObject @content
*/
$content = $doc->find($path);
+ $bases = $doc->document->getElementsByTagName('base');
+ if (!empty($bases[0]) && $bases[0]->getAttribute('href') != '') {
+ $url = $bases[0]->getAttribute('href');
+ }
$html = trim(sanitizeHTML($content->__toString(), $url));
phpQuery::unloadDocuments();
return $html;
diff --git a/lib/lib_phpQuery.php b/lib/lib_phpQuery.php
index 411aa120c..34269c301 100644
--- a/lib/lib_phpQuery.php
+++ b/lib/lib_phpQuery.php
@@ -2917,7 +2917,7 @@ class phpQueryObject
* jQuey difference
*
* @param $markup
- * @return unknown_type
+ * @return string
*/
public function markupOuter($callback1 = null, $callback2 = null, $callback3 = null) {
$args = func_get_args();