Merge branch '1.0.x' into testing

2011-09-26 17:06:14 -04:00 · 2011-09-26 17:06:14 -04:00 · a9f83008b8
commit a9f83008b8
parent b816d24dcc 540c545399
1 changed files with 5 additions and 1 deletions
--- a/lib/util.php
+++ b/lib/util.php
@ -2163,7 +2163,11 @@ function common_shorten_url($long_url, User $user=null, $force = false)
            } else {
                $shortenedUrl = common_local_url('redirecturl',
                                                 array('id' => $f->id));
-                return $shortenedUrl;
+                if ((mb_strlen($shortenedUrl) < mb_strlen($long_url)) || $force) {
+                    return $shortenedUrl;
+                } else {
+                    return $long_url;
+                }
            }
        } else {
            return $long_url;