You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2016/12/17 01:41:11 UTC
incubator-ponymail git commit: code assumes that subject is always
present in an e-mail
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 48b06fe04 -> b40d8b705
code assumes that subject is always present in an e-mail
This fixes #149
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/b40d8b70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/b40d8b70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/b40d8b70
Branch: refs/heads/master
Commit: b40d8b705b30ec10d99ec90820b6f533d236c94b
Parents: 48b06fe
Author: Sebb <se...@apache.org>
Authored: Sat Dec 17 01:40:58 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Sat Dec 17 01:40:58 2016 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
site/api/source.lua | 2 +-
site/api/thread.lua | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b40d8b70/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16232a..74716d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@
- confusion of storageAvailable and localStorage in ponymail.js (#194)
- unnecessary double-checking of window.sessionStorage in ponymail.js (#193)
- lua scripts not using cross.contentType() compatibility function (#218)
+- code assumes that subject is always present in an e-mail (#149)
## CHANGES in 0.9b:
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b40d8b70/site/api/source.lua
----------------------------------------------------------------------
diff --git a/site/api/source.lua b/site/api/source.lua
index ee544fd..64275ac 100644
--- a/site/api/source.lua
+++ b/site/api/source.lua
@@ -30,7 +30,7 @@ function handle(r)
local doc = elastic.get("mbox", eid or "hmm")
-- Try searching by mid if not found, for backward compat
- if not doc or not doc.subject then
+ if not doc or not doc.mid then
local docs = elastic.find("message-id:\"" .. r:escape(eid) .. "\"", 1, "mbox")
if #docs == 1 then
doc = docs[1]
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b40d8b70/site/api/thread.lua
----------------------------------------------------------------------
diff --git a/site/api/thread.lua b/site/api/thread.lua
index e485ed1..8e8422a 100644
--- a/site/api/thread.lua
+++ b/site/api/thread.lua
@@ -90,7 +90,7 @@ function handle(r)
local _, doc = pcall(function() return elastic.get("mbox", eid or "hmm") end)
emls_thrd = {}
-- Try searching by mid if not found, for backward compat
- if not doc or not doc.subject then
+ if not doc or not doc.mid then
local docs = elastic.find("message-id:\"" .. r:escape(eid) .. "\"", 1, "mbox")
if #docs == 1 then
doc = docs[1]