aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-10-08 15:09:54 +0200
committermarijus <mario@mariovavti.com>2014-10-08 15:09:54 +0200
commit9a1c3f10b2ea10e69fe1d293ce1ae25bdcd37a8a (patch)
tree13bdeb80011b80c169d1b2a4db768f1d9f0758ed
parent0dcbebba771da7a883c4305059dfbc9e5f5111bd (diff)
parent1fc3138c37564f44ea028c5fa8e69c718d08f363 (diff)
downloadvolse-hubzilla-9a1c3f10b2ea10e69fe1d293ce1ae25bdcd37a8a.tar.gz
volse-hubzilla-9a1c3f10b2ea10e69fe1d293ce1ae25bdcd37a8a.tar.bz2
volse-hubzilla-9a1c3f10b2ea10e69fe1d293ce1ae25bdcd37a8a.zip
Merge branch 'master' of https://github.com/friendica/red
-rwxr-xr-xinclude/oembed.php9
-rw-r--r--version.inc2
2 files changed, 10 insertions, 1 deletions
diff --git a/include/oembed.php b/include/oembed.php
index de3a6edc8..8ce0fee96 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -56,6 +56,15 @@ function oembed_fetch_url($embedurl){
$txt = $x['body'];
break;
}
+ // soundcloud is now using text/json+oembed instead of application/json+oembed,
+ // others may be also
+ $entries = $xpath->query("//link[@type='text/json+oembed']");
+ foreach($entries as $e){
+ $href = $e->getAttributeNode("href")->nodeValue;
+ $x = z_fetch_url($href . '&maxwidth=' . $a->videowidth);
+ $txt = $x['body'];
+ break;
+ }
}
}
}
diff --git a/version.inc b/version.inc
index 203193fb7..147cef258 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-07.821
+2014-10-08.822