From ca0b341401d1f577a4d14f02161ea794c8cb1d28 Mon Sep 17 00:00:00 2001 From: bastei Date: Thu, 26 Sep 2013 06:45:47 +0200 Subject: ArticleEnhancer: convert relative urls to html characters --- tests/unit/utility/articleenhancer/ArticleEnhancerTest.php | 8 ++++---- utility/articleenhancer/articleenhancer.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit/utility/articleenhancer/ArticleEnhancerTest.php b/tests/unit/utility/articleenhancer/ArticleEnhancerTest.php index ce105db49..f252c4fac 100644 --- a/tests/unit/utility/articleenhancer/ArticleEnhancerTest.php +++ b/tests/unit/utility/articleenhancer/ArticleEnhancerTest.php @@ -246,7 +246,7 @@ class ArticleEnhancerTest extends \OCA\AppFramework\Utility\TestUtility { $file->headers = array("content-type"=>"text/html; charset=utf-8"); $file->body = ' -

'; $item = new Item(); @@ -260,11 +260,11 @@ class ArticleEnhancerTest extends \OCA\AppFramework\Utility\TestUtility { ->will($this->returnValue($file)); $this->purifier->expects($this->once()) ->method('purify') - ->with($this->equalTo('

')) - ->will($this->returnValue('

')); + ->with($this->equalTo('

')) + ->will($this->returnValue('

')); $result = $this->testEnhancer->enhance($item); - $this->assertEquals('

', $result->getBody()); + $this->assertEquals('

', $result->getBody()); } public function testDontTransformAbsoluteUrlsAndMails() { diff --git a/utility/articleenhancer/articleenhancer.php b/utility/articleenhancer/articleenhancer.php index 823ddcc18..6450f638d 100644 --- a/utility/articleenhancer/articleenhancer.php +++ b/utility/articleenhancer/articleenhancer.php @@ -121,7 +121,7 @@ abstract class ArticleEnhancer { $xpathResult = $xpath->query("//*[@".$attribute." and not(contains(@".$attribute.", '://')) and not(starts-with(@".$attribute.", 'mailto:'))]"); foreach ($xpathResult as $linkNode) { $urlElement = $linkNode->attributes->getNamedItem($attribute); - $urlElement->nodeValue = $this->relativeToAbsoluteUrl( $urlElement->nodeValue, $absoluteUrl ); + $urlElement->nodeValue = htmlentities( $this->relativeToAbsoluteUrl( $urlElement->nodeValue, $absoluteUrl ) ); } } -- cgit v1.2.3