diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
| commit | a535ccdc4eba320ad88dc531329ae63c7f09c258 (patch) | |
| tree | a8448dfe0b764818562ca9d04a39f04d4978dead /extlib | |
| parent | f949c2c9d9afa63496f26b33d0309f8d06f77520 (diff) | |
| parent | 0c95734a6874608ea5ed44608cabeda7c3a1b4ea (diff) | |
Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
lib/common.php
lib/twitter.php
Diffstat (limited to 'extlib')
| -rw-r--r-- | extlib/Services/oEmbed.php | 10 | ||||
| -rw-r--r-- | extlib/Stomp.php | 2 |
2 files changed, 6 insertions, 6 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; diff --git a/extlib/Stomp.php b/extlib/Stomp.php index 9e1c97b3b..abd9cba62 100644 --- a/extlib/Stomp.php +++ b/extlib/Stomp.php @@ -454,7 +454,7 @@ class Stomp */ public function disconnect () { - $header = array(); + $headers = array(); if ($this->clientId != null) { $headers["client-id"] = $this->clientId; |