diff --git a/serendipity_plugin_flickrbadge/ChangeLog b/serendipity_plugin_flickrbadge/ChangeLog index 8310b8b0..011a203b 100644 --- a/serendipity_plugin_flickrbadge/ChangeLog +++ b/serendipity_plugin_flickrbadge/ChangeLog @@ -1,3 +1,7 @@ +0.13: +----- + * Use serendipity_request_url() + 0.12: ----- * Added serendipity_request_url API method diff --git a/serendipity_plugin_flickrbadge/lib/flickr.php b/serendipity_plugin_flickrbadge/lib/flickr.php index 42c1385c..b8cc56e6 100644 --- a/serendipity_plugin_flickrbadge/lib/flickr.php +++ b/serendipity_plugin_flickrbadge/lib/flickr.php @@ -81,11 +81,16 @@ class serendipity_plugin_flickrbadge_flickr $params = ''; foreach ($arguments as $key => $argument) $params .= "{$key}=" . urlencode($argument) . "&"; $url = $this->_url . "?" . $params; - require_once S9Y_PEAR_PATH . 'HTTP/Request.php'; - $request = new HTTP_Request($url); - $request->setMethod(HTTP_REQUEST_METHOD_GET); - $request->sendRequest(); - $response = unserialize($request->getResponseBody()); + if (function_exists('serendipity_request_url')) { + $response = unserialize(serendipity_request_url($url)); + } else { + require_once S9Y_PEAR_PATH . 'HTTP/Request.php'; + serendipity_request_start(); + $request = new HTTP_Request($url); + $request->setMethod(HTTP_REQUEST_METHOD_GET); + $request->sendRequest(); + $response = unserialize($request->getResponseBody()); + } if ($response['stat'] != 'ok') throw new Exception($response['message'], $response['code']); return $response; diff --git a/serendipity_plugin_flickrbadge/serendipity_plugin_flickrbadge.php b/serendipity_plugin_flickrbadge/serendipity_plugin_flickrbadge.php index 1dfdcc9b..76b4bd9e 100644 --- a/serendipity_plugin_flickrbadge/serendipity_plugin_flickrbadge.php +++ b/serendipity_plugin_flickrbadge/serendipity_plugin_flickrbadge.php @@ -7,7 +7,7 @@ * * @author Lars Strojny */ -@define('SERENDIPITY_PLUGIN_FLICKRBADGE_VERSION', '0.12'); +@define('SERENDIPITY_PLUGIN_FLICKRBADGE_VERSION', '0.13'); if (IN_SERENDIPITY != true) die("Don't hack");