ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject incubator-ponymail git commit: user.getUser() overwrites login global variable; defines unused variable 'usr'
Date Mon, 31 Oct 2016 16:37:19 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master a908ed67e -> 5902f73dc


user.getUser() overwrites login global variable; defines unused variable 'usr'

Fixes #138
Closes #144


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/5902f73d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/5902f73d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/5902f73d

Branch: refs/heads/master
Commit: 5902f73dc660c594ce25206e8c8b64060820cba1
Parents: a908ed6
Author: Sebb <sebb@apache.org>
Authored: Mon Oct 31 16:34:27 2016 +0000
Committer: Sebb <sebb@apache.org>
Committed: Mon Oct 31 16:36:17 2016 +0000

----------------------------------------------------------------------
 site/api/lib/user.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/5902f73d/site/api/lib/user.lua
----------------------------------------------------------------------
diff --git a/site/api/lib/user.lua b/site/api/lib/user.lua
index bc7791a..decd446 100644
--- a/site/api/lib/user.lua
+++ b/site/api/lib/user.lua
@@ -20,7 +20,7 @@ local elastic = require 'lib/elastic'
 -- Get user data from DB
 function getUser(r, override)
     local ocookie = r:getcookie("ponymail")
-    local usr = {}
+    local login = {}
     if override or (ocookie and #ocookie > 43) then
         local cookie, cid = r:unescape(ocookie or ""):match("([a-f0-9]+)==(.+)")
         if override or (cookie and #cookie >= 40 and cid) then


Mime
View raw message