diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-04-03 19:34:47 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-04-03 19:34:47 +0100 |
| commit | 9ba4eef47c2806af0323f8ee215acfa16e49df57 (patch) | |
| tree | ed4ed89ea492be641fddc99be7d2da14e5015e51 /core/rostermanager.lua | |
| parent | 12d6e03b5b62d8974f98492112a70fc754b5cb28 (diff) | |
| parent | 4d46c2e86673dfb6d00865017929cf27e0aa22ac (diff) | |
| download | prosody-9ba4eef47c2806af0323f8ee215acfa16e49df57.tar.gz prosody-9ba4eef47c2806af0323f8ee215acfa16e49df57.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/rostermanager.lua')
| -rw-r--r-- | core/rostermanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 19d07c94..7e165c27 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -227,7 +227,7 @@ function is_contact_pending_in(username, host, jid) local roster = load_roster(username, host); return roster[false].pending[jid]; end -function set_contact_pending_in(username, host, jid, pending) +function set_contact_pending_in(username, host, jid) local roster = load_roster(username, host); local item = roster[jid]; if item and (item.subscription == "from" or item.subscription == "both") then |