From bf175ef8a0dc47a7fb2d76ec502b7de987995578 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Wed, 6 Jan 2016 23:41:58 +0100
Subject: [PATCH] Fix 2685
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Print the dash owner’s username when using sticky dash.
---
 html/pages/edituser.inc.php | 2 +-
 html/pages/front/tiles.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/pages/edituser.inc.php b/html/pages/edituser.inc.php
index c07c48037..0966df70c 100644
--- a/html/pages/edituser.inc.php
+++ b/html/pages/edituser.inc.php
@@ -384,7 +384,7 @@ if (passwordscanchange($users_details['username'])) {
            <div class='col-sm-4'><select class='form-control' name='dashboard'>";
     $defdash = dbFetchCell("SELECT dashboard FROM users WHERE user_id = ?",array($vars['user_id']));
     foreach(dbFetchRows("SELECT dashboards.*,users.username FROM `dashboards` INNER JOIN `users` ON users.user_id = dashboards.user_id WHERE (dashboards.access > 0 && dashboards.user_id != ?) || dashboards.user_id = ?",array($vars['user_id'],$vars['user_id'])) as $dash) {
-        echo "<option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".$dash['dashboard_name']."</option>";
+        echo "<option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".$dash['username'].':'.$dash['dashboard_name']."</option>";
     }
     echo "</select>
            </div>
diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php
index 67b1b8f59..1b0207bd9 100644
--- a/html/pages/front/tiles.php
+++ b/html/pages/front/tiles.php
@@ -37,7 +37,7 @@ if (!empty($vars['dashboard'])) {
 }
 if (empty($vars['dashboard'])) {
     if ($default_dash != 0) {
-        $vars['dashboard'] = dbFetchRow('select * from dashboards where dashboard_id = ?',array($default_dash));
+        $vars['dashboard'] = dbFetchRow('select dashboards.*,users.username from dashboards inner join users on dashboards.user_id = users.user_id where dashboards.dashboard_id = ?',array($default_dash));
     }
     else {
         $vars['dashboard'] = dbFetchRow('select * from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id']));