better specify yt url

owncloud-archive · Sep 22, 2014 · 785a085 · 785a085
1 parent 19910df
commit 785a085
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/articleenhancer/globalarticleenhancer.php b/articleenhancer/globalarticleenhancer.php
@@ -38,7 +38,7 @@ public function enhance(Item $item) {
 			// src needs to be matched against regex to prevent false positives
 			// and because theres no XPath matches function available
 			$src = $element->getAttribute('src');
-			$regex = '%^(http://|https://|//)(www\.)?youtube.com/.*autoplay=1.*%i';
+			$regex = '%^(http://|https://|//)(www\.)?youtube.com/.*\?.*autoplay=1.*%i';
 
 			if (preg_match($regex, $src)) {
 				$replaced = str_replace('autoplay=1', 'autoplay=0', $src);

diff --git a/tests/unit/articleenhancer/GlobalArticleEnhancerTest.php b/tests/unit/articleenhancer/GlobalArticleEnhancerTest.php
@@ -26,8 +26,8 @@ protected function setUp() {
 
 
 	public function testNoReplaceYoutubeAutoplay() {
-		$body = '<iframe width="728" height="410" src="//www.youtube.com/embed/AWE6UpXQoGU?autoplay=0" frameborder="0" allowfullscreen=""></iframe>';
-		$expected = '<iframe width="728" height="410" src="//www.youtube.com/embed/AWE6UpXQoGU?autoplay=0" frameborder="0" allowfullscreen=""></iframe>';
+		$body = '<iframe width="728" height="410" src="//www.youtube.com/embed/autoplay=1/AWE6UpXQoGU" frameborder="0" allowfullscreen=""></iframe>';
+		$expected = '<iframe width="728" height="410" src="//www.youtube.com/embed/autoplay=1/AWE6UpXQoGU" frameborder="0" allowfullscreen=""></iframe>';
 		$item = new Item();
 		$item->setBody($body);