summaryrefslogtreecommitdiff
path: root/extlib/Services
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-09-01 23:17:45 -0400
committerCraig Andrews <candrews@integralblue.com>2009-09-01 23:18:39 -0400
commit29d0dd740c329c2674de58bec172419148a1b495 (patch)
tree704559521de57ad6b063895b71dfccb19f956564 /extlib/Services
parentefcfd209ef737f4dbe99401df282e7a341176ea7 (diff)
Allow whitespace before and after the = and require space before the href in <link href="url"> html
Diffstat (limited to 'extlib/Services')
-rw-r--r--extlib/Services/oEmbed.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/extlib/Services/oEmbed.php b/extlib/Services/oEmbed.php
index b05e3a1d1..0dc8f01b2 100644
--- a/extlib/Services/oEmbed.php
+++ b/extlib/Services/oEmbed.php
@@ -256,7 +256,7 @@ class Services_oEmbed
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
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);
@@ -302,7 +302,7 @@ class Services_oEmbed
// Find all <link /> tags that have a valid oembed type set. We then
// extract the href attribute for each type.
- $regexp = '#<link([^>]*)type="' .
+ $regexp = '#<link([^>]*)type[\s\n]*=[\s\n]*"' .
'(application/json|text/xml)\+oembed"([^>]*)>#im';
$m = $ret = array();
@@ -314,7 +314,7 @@ class Services_oEmbed
foreach ($m[0] as $i => $link) {
$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];
}
}
@@ -347,7 +347,7 @@ class Services_oEmbed
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
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;