diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-12 21:01:34 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-12 21:01:34 +0000 |
| commit | 18df82ba2302d5b72bc42f4d3296d6fff7d16341 (patch) | |
| tree | ce2f955ff860b8d7355d64391d68a0f955067ec9 /extlib/Services | |
| parent | 131292472c4bca7e99ee821ae62853f36f4c7bef (diff) | |
| parent | 2b6dfbdf2b9df0992018f8df1f54b4cf16185599 (diff) | |
Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x
Diffstat (limited to 'extlib/Services')
| -rw-r--r-- | extlib/Services/oEmbed.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extlib/Services/oEmbed.php b/extlib/Services/oEmbed.php index 7d507b6f6..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,8 +302,8 @@ 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="' . - '(application/json|text/xml)\+oembed"([^>]*)>#i'; + $regexp = '#<link([^>]*)type[\s\n]*=[\s\n]*"' . + '(application/json|text/xml)\+oembed"([^>]*)>#im'; $m = $ret = array(); if (!preg_match_all($regexp, $body, $m)) { @@ -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; |