Merge branch 'lars' into 'master'

BUG FIX: username doesn't cut off in link See merge request !181
2017-02-02 12:53:13 +01:00
parent d03d58ce37 327a6a8f5c
commit ab5f243281
3 changed files with 11 additions and 7 deletions
--- a/website/public/bits/friend-item.php
+++ b/website/public/bits/friend-item.php
@@ -41,7 +41,7 @@ foreach($friends as $i => $friend) {
                        <?= $friend->fullname ?><br/>
                        <span style='color: #666'><?php
                            if (isset($friend->username)) {
-                                echo $friend->username;
+                                echo $friend->usernameshort;
                            } else if (isset($friend->content)) {
                                echo $friend->content;
                            }