Merge pull request #1 from fguillot/master

2 files changed, 18 insertions, 2 deletions

diff --git a/app/Core/User/Avatar/AvatarManager.php b/app/Core/User/Avatar/AvatarManager.php
index 71bd8aa5..5b61cbdb 100644
--- a/app/Core/User/Avatar/AvatarManager.php
+++ b/app/Core/User/Avatar/AvatarManager.php
@@ -32,23 +32,25 @@ class AvatarManager
     }
 
     /**
-     * Render avatar html element
+     * Render avatar HTML element
      *
      * @access public
      * @param  string   $user_id
      * @param  string   $username
      * @param  string   $name
      * @param  string   $email
+     * @param  string   $avatar_path
      * @param  int      $size
      * @return string
      */
-    public function render($user_id, $username, $name, $email, $size)
+    public function render($user_id, $username, $name, $email, $avatar_path, $size)
     {
         $user = array(
             'id' => $user_id,
             'username' => $username,
             'name' => $name,
             'email' => $email,
+            'avatar_path' => $avatar_path,
         );
 
         krsort($this->providers);
@@ -80,6 +82,7 @@ class AvatarManager
                 'username' => '',
                 'name' => '?',
                 'email' => '',
+                'avatar_path' => '',
             );
 
             return $provider->render($user, $size);
diff --git a/app/Core/User/UserSession.php b/app/Core/User/UserSession.php
index e494e7b4..0034c47a 100644
--- a/app/Core/User/UserSession.php
+++ b/app/Core/User/UserSession.php
@@ -14,6 +14,19 @@ use Kanboard\Core\Security\Role;
 class UserSession extends Base
 {
     /**
+     * Refresh current session if necessary
+     *
+     * @access public
+     * @param integer $user_id
+     */
+    public function refresh($user_id)
+    {
+        if ($this->getId() == $user_id) {
+            $this->initialize($this->user->getById($user_id));
+        }
+    }
+
+    /**
      * Update user session
      *
      * @access public