wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow whitespace before and after the = and require space before the href in <link href="url"> html

Browse Source
This commit is contained in:
Craig Andrews 2009-09-01 23:17:45 -04:00
parent efcfd209ef
commit 29d0dd740c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extlib/Services/oEmbed.php
View File

@ -256,7 +256,7 @@ class Services_oEmbed
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE); $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if (substr($code, 0, 1) != '2') { if (substr($code, 0, 1) != '2') {
throw new Services_oEmbed_Exception('Non-200 code returned'); throw new Services_oEmbed_Exception('Non-200 code returned. Got code ' . $code);
} }
curl_close($ch); curl_close($ch);
@ -302,7 +302,7 @@ class Services_oEmbed
// Find all <link /> tags that have a valid oembed type set. We then // Find all <link /> tags that have a valid oembed type set. We then
// extract the href attribute for each type. // extract the href attribute for each type.
$regexp = '#<link([^>]*)type="' . $regexp = '#<link([^>]*)type[\s\n]*=[\s\n]*"' .
'(application/json|text/xml)\+oembed"([^>]*)>#im'; '(application/json|text/xml)\+oembed"([^>]*)>#im';
$m = $ret = array(); $m = $ret = array();
@ -314,7 +314,7 @@ class Services_oEmbed
foreach ($m[0] as $i => $link) { foreach ($m[0] as $i => $link) {
$h = array(); $h = array();
if (preg_match('/href="([^"]+)"/i', $link, $h)) { if (preg_match('/[\s\n]+href[\s\n]*=[\s\n]*"([^"]+)"/im', $link, $h)) {
$ret[$m[2][$i]] = $h[1]; $ret[$m[2][$i]] = $h[1];
} }
} }
@ -347,7 +347,7 @@ class Services_oEmbed
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE); $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if (substr($code, 0, 1) != '2') { if (substr($code, 0, 1) != '2') {
throw new Services_oEmbed_Exception('Non-200 code returned'); throw new Services_oEmbed_Exception('Non-200 code returned. Got code ' . $code);
} }
return $result; return $result;