prosody
be4b1e796bd2%3A6877179335a9

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

2662:6877179335a9

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Feb 2010 16:46:07 +0000
parents 2658:a4879b1e6cde (diff) 2661:be4b1e796bd2 (current diff)
children 2666:ef33efdec5bb
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua	Thu Feb 18 16:44:26 2010 +0000
+++ b/plugins/muc/muc.lib.lua	Thu Feb 18 16:46:07 2010 +0000
@@ -514,6 +514,9 @@
 					if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
 						local occupant = self._occupants[self.jid.."/"..item.attr.nick];
 						if occupant then item.attr.jid = occupant.jid; end
+					elseif not item.attr.nick and item.attr.jid then
+						local nick = self._jid_nick[item.attr.jid];
+						if nick then item.attr.nick = select(3, jid_split(nick)); end
 					end
 					local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1];
 					if item.attr.affiliation and item.attr.jid and not item.attr.role then
--- a/prosody	Thu Feb 18 16:44:26 2010 +0000
+++ b/prosody	Thu Feb 18 16:46:07 2010 +0000
@@ -22,9 +22,6 @@
 	package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
-package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
-package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
-
 -- Substitute ~ with path to home directory in data path
 if CFG_DATADIR then
 	if os.getenv("HOME") then