Merge branch 'release/1.3.2'

Josh Angell · Josh Angell · commit dfb926423690 · 2016-06-10T08:41:50.000+01:00
* release/1.3.2:
  1.3.2
  For youtube, modify the url in the iframe to add &amp;wmode=transparent
diff --git a/fetch/FetchPlugin.php b/fetch/FetchPlugin.php
@@ -20,7 +20,7 @@ public function getName()
 
   public function getVersion()
   {
-    return '1.3.1';
+    return '1.3.2';
   }
 
   public function getSchemaVersion()
diff --git a/fetch/services/FetchService.php b/fetch/services/FetchService.php
@@ -230,12 +230,19 @@ public function get($url, $scripts = true)
       // Youtube mods
       if ( $provider === 'youtube' )
       {
+        // Add youtube ID
         preg_match("/^(?:http(?:s)?:\/\/)?(?:www\.)?(?:m\.)?(?:youtu\.be\/|youtube\.com\/(?:(?:watch)?\?(?:.*&)?v(?:i)?=|(?:embed|v|vi|user)\/))([^\?#&\"'>]+)/", $url, $matches);
 
         if (isset($matches[1])) {
           $decodedJSON['youtube_id'] = $matches[1];
         }
 
+        // Modify the url in the iframe to add &wmode=transparent
+        if (isset($html))
+        {
+          $html = preg_replace('/src\=\\"(.*?)\\"(.*?)/i', 'src="$1$2&wmode=transparent"$3', $html);
+          $decodedJSON['html'] = $html;
+        }
       }
 
       // check we haven't any errors or 404 etc

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function getName()`
`20`	`20`
`21`	`21`	`public function getVersion()`
`22`	`22`	`{`
`23`		`- return '1.3.1';`
	`23`	`+ return '1.3.2';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function getSchemaVersion()`
Original file line number	Diff line number	Diff line change
`@@ -230,12 +230,19 @@ public function get($url, $scripts = true)`
`230`	`230`	`// Youtube mods`
`231`	`231`	`if ( $provider === 'youtube' )`
`232`	`232`	`{`
	`233`	`+ // Add youtube ID`
`233`	`234`	`preg_match("/^(?:http(?:s)?:\/\/)?(?:www\.)?(?:m\.)?(?:youtu\.be\/\|youtube\.com\/(?:(?:watch)?\?(?:.*&)?v(?:i)?=\|(?:embed\|v\|vi\|user)\/))([^\?#&\"'>]+)/", $url, $matches);`
`234`	`235`
`235`	`236`	`if (isset($matches[1])) {`
`236`	`237`	`$decodedJSON['youtube_id'] = $matches[1];`
`237`	`238`	`}`
`238`	`239`
	`240`	`+ // Modify the url in the iframe to add &wmode=transparent`
	`241`	`+ if (isset($html))`
	`242`	`+ {`
	`243`	`+ $html = preg_replace('/src\=\\"(.?)\\"(.?)/i', 'src="$1$2&wmode=transparent"$3', $html);`
	`244`	`+ $decodedJSON['html'] = $html;`
	`245`	`+ }`
`239`	`246`	`}`
`240`	`247`
`241`	`248`	`// check we haven't any errors or 404 etc`