Use the profile URI when linking instead of URL

since we'll then get to /user/$id instead of /$nickname which is
good for future archives if someone changes their nickname...

diff --git a/lib/util.php b/lib/util.php
index 4dd86fa3705d4ac64ddd89b9eefbec44833f03fc..b7eac68619c16ade5cb2d9ba80130d0f1b0a3c12 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -771,7 +771,10 @@ function common_find_mentions($text, Profile $sender, Notice $parent=null)
 
             if ($mentioned instanceof Profile) {
                 try {
-                    $url = $mentioned->getUrl();
+                    $url = $mentioned->getUri();    // prefer the URI as URL, if it is one.
+                    if (!common_valid_http_url($url)) {
+                        $url = $mentioned->getUrl();
+                    }
                 } catch (InvalidUrlException $e) {
                     $url = common_local_url('userbyid', array('id' => $mentioned->getID()));
                 }