Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

2009-11-08 23:33:58 +01:00
parent 5ab709b739 fc5002015b
commit b10f362ede
75 changed files with 7718 additions and 4851 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -576,7 +576,7 @@ function common_linkify($url) {
        } elseif (is_string($longurl_data)) {
            $longurl = $longurl_data;
        } else {
-            throw new ServerException("Cannot linkify url '$url'");
+            throw new ServerException("Can't linkify url '$url'");
        }
    }
    $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');