Two improvements to Joe's fix for #1504:

1) Trap all exceptions, eg dns or connectivity issues and
   report back in the form (but put the stack trace in the logs)
2) Rename "noconn" to "no_connection"

1 files changed, 10 insertions, 5 deletions

diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 2af5c8d0..8fc66b68 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -55,11 +55,16 @@ class l10n_client_Core {
     $url = self::_server_url("status");
     $signature = self::_sign($version, $api_key);
 
-    list ($response_data, $response_status) = remote::post(
-      $url, array("version" => $version,
-                  "client_token" => l10n_client::client_token(),
-                  "signature" => $signature,
-                  "uid" => l10n_client::server_uid($api_key)));
+    try {
+      list ($response_data, $response_status) = remote::post(
+        $url, array("version" => $version,
+                    "client_token" => l10n_client::client_token(),
+                    "signature" => $signature,
+                    "uid" => l10n_client::server_uid($api_key)));
+    } catch (ErrorException $e) {
+      // Log the error, but then return a "can't make connection" error
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+    }
     if (!isset($response_data) && !isset($response_status)) {
       return array(false, false);
     }