From 6ce9cf715ef62648ec7525297ec00950a27bfd89 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sat, 24 Oct 2009 12:33:38 -0400
Subject: [PATCH] These should be Horde_Http_Exception objects, not
 Horde_Http_Client_Exception

---
 framework/Oauth/lib/Horde/Oauth/Consumer.php | 4 ++--
 framework/Release/lib/Horde/Release.php      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/Oauth/lib/Horde/Oauth/Consumer.php b/framework/Oauth/lib/Horde/Oauth/Consumer.php
index baf4ebd27..69d3fd606 100644
--- a/framework/Oauth/lib/Horde/Oauth/Consumer.php
+++ b/framework/Oauth/lib/Horde/Oauth/Consumer.php
@@ -73,7 +73,7 @@ class Horde_Oauth_Consumer
                 $this->requestTokenUrl,
                 $request->buildHttpQuery()
             );
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Oauth_Exception($e->getMessage());
         }
 
@@ -117,7 +117,7 @@ class Horde_Oauth_Consumer
                 $this->accessTokenUrl,
                 $request->buildHttpQuery()
             );
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Oauth_Exception($e->getMessage());
         }
 
diff --git a/framework/Release/lib/Horde/Release.php b/framework/Release/lib/Horde/Release.php
index 53ff344b9..1232d6839 100644
--- a/framework/Release/lib/Horde/Release.php
+++ b/framework/Release/lib/Horde/Release.php
@@ -684,7 +684,7 @@ class Horde_Release
             $response = $http->post('http://freshmeat.net/projects/' . $this->notes['fm']['project'] . '/releases.json',
                                     Horde_Serialize::serialize($fm_params, Horde_Serialize::JSON),
                                     array('Content-Type' => 'application/json'));
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             if (strpos($e->getMessage(), '201 Created') === false) {
                 throw new Horde_Exception($e);
             } else {
@@ -706,7 +706,7 @@ class Horde_Release
         $http = new Horde_Http_Client();
         try {
             $response = $http->get('http://freshmeat.net/projects/' . $this->notes['fm']['project'] . '/urls.json?auth_code=' . $this->_options['fm']['user_token']);
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Exception($e);
         }
 
@@ -738,7 +738,7 @@ class Horde_Release
                                             Horde_Serialize::serialize($link, Horde_Serialize::JSON),
                                             array('Content-Type' => 'application/json'));
                     $response = $response->getBody();
-                } catch (Horde_Http_Client_Exception $e) {
+                } catch (Horde_Http_Exception $e) {
                     if (strpos($e->getMessage(), '201 Created') === false) {
                         throw new Horde_Exception($e);
                     } else {
@@ -753,7 +753,7 @@ class Horde_Release
                                            array('Content-Type' => 'application/json'));
                     $response = $response->getBody();
                     // Status: 200???
-                } catch (Horde_Http_Client_Exception $e) {
+                } catch (Horde_Http_Exception $e) {
                     throw new Horde_Exception($e);
                 }
             }
-- 
2.11.0