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/queries/user.php
+++ b/website/queries/user.php
@@ -355,7 +355,8 @@ function searchSomeUsers($n, $m, $search) {
    $stmt = prepareQuery("
    SELECT
        `userID`,
-        LEFT(`username`, 12) as `username`,
+        LEFT(`username`, 12) as `usernameshort`,
+        `username`,
        IFNULL(
            `profilepicture`,
            '../img/avatar-standard.png'