Merged changes up to 2.3.16 into unstable

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index e3a28b0617d34e3e8b6fdc89688d50bd4138448e..7d80febbe3b4f02f8f1acb00a5bd1a8d6f3d1903 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -22,6 +22,7 @@ class current_user
        var $loginname;
        var $username;
        var $name;
+       var $email;
        var $company; // user's company
        var $pos;
        var $access;
@@ -130,6 +131,7 @@ class current_user
                    $this->username = $this->loginname;
                    $this->prefs = new user_prefs($myrow);
                    $this->user = @$myrow["id"];
+                $this->email = @$myrow["email"];
                        update_user_visitdate($this->username);
                        $this->logged = true;
                                $this->last_act = time();