Merge branch 'master' into 1.0.x

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/util.php b/lib/util.php
index 8eff4e568..f187926b5 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -845,7 +845,10 @@ function common_linkify($url) {
         } elseif (is_string($longurl_data)) {
             $longurl = $longurl_data;
         } else {
-            throw new ServerException("Can't linkify url '$url'");
+            // Unable to reach the server to verify contents, etc
+            // Just pass the link on through for now.
+            common_log(LOG_ERR, "Can't linkify url '$url'");
+            $longurl = $url;
         }
     }
     $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');