fix 388055 imap filters on non-default headers fail, sr=mscott
git-svn-id: svn://10.0.0.236/trunk@230085 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -406,8 +406,7 @@ NS_IMETHODIMP nsMsgFilter::GetTerm(PRInt32 termIndex,
|
||||
term->GetValue(value);
|
||||
if(booleanAnd)
|
||||
term->GetBooleanAnd(booleanAnd);
|
||||
if (attrib && !arbitraryHeader.IsEmpty()
|
||||
&& *attrib > nsMsgSearchAttrib::OtherHeader
|
||||
if (attrib && *attrib > nsMsgSearchAttrib::OtherHeader
|
||||
&& *attrib < nsMsgSearchAttrib::kNumMsgSearchAttributes)
|
||||
term->GetArbitraryHeader(arbitraryHeader);
|
||||
}
|
||||
|
||||
@@ -1171,7 +1171,7 @@ nsresult nsMsgFilterList::ComputeArbitraryHeaders()
|
||||
{
|
||||
if (m_arbitraryHeaders.IsEmpty())
|
||||
m_arbitraryHeaders.Assign(arbitraryHeader);
|
||||
else if (PL_strncasecmp(m_arbitraryHeaders.get(), arbitraryHeader.get(), arbitraryHeader.Length()))
|
||||
else if (m_arbitraryHeaders.Find(arbitraryHeader, PR_TRUE) == kNotFound)
|
||||
{
|
||||
m_arbitraryHeaders.Append(" ");
|
||||
m_arbitraryHeaders.Append(arbitraryHeader);
|
||||
|
||||
Reference in New Issue
Block a user