Bug 134814 - Collapsing messages will collapse too much

fix previous patch
p=gijskruitbosch@gmail.com
r=silver@warwickcompsoc.co.uk
chatzilla only


git-svn-id: svn://10.0.0.236/trunk@182918 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
samuel%sieb.net 2005-10-24 22:03:02 +00:00
parent 036f89018d
commit 5355b8c6f9

View File

@ -3852,7 +3852,9 @@ function addHistory (source, obj, mergeData)
// Does the motif collapse everything, regardless of type?
// NOTE: the collapseActions pref can override this for actions
needSameType = !("collapsemore" in source.motifSettings);
needSameType = !(("motifSettings" in source) &&
source.motifSettings &&
("collapsemore" in source.motifSettings));
}
if (sameNick && sameDest && (haveSameType || !needSameType) &&