Merge pull request #1661 from annando/issue-1640

Improved OEmbed detection

include/oembed.php

@@ -37,7 +37,6 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 				if ($dom){
 					$xpath = new DOMXPath($dom);
 					$attr = "oembed";
-
 					$xattr = oe_build_xpath("class","oembed");
 					$entries = $xpath->query("//link[@type='application/json+oembed']");
 					foreach($entries as $e){
@@ -45,6 +44,12 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
 					}
+					$entries = $xpath->query("//link[@type='text/json+oembed']");
+					foreach($entries as $e){
+						$href = $e->getAttributeNode("href")->nodeValue;
+						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
+						break;
+					}
 				}
 			}
 		}