diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
| commit | daec51c435ca77914271200607841d55ff7408d7 (patch) | |
| tree | 15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /core/rostermanager.lua | |
| parent | ba96c2f7db5ce079d7609dff90591b9872ba6143 (diff) | |
| parent | a540d613cd08b8feee096d19b727d1f5b2cab507 (diff) | |
| download | prosody-daec51c435ca77914271200607841d55ff7408d7.tar.gz prosody-daec51c435ca77914271200607841d55ff7408d7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/rostermanager.lua')
| -rw-r--r-- | core/rostermanager.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 612a349f..a9b26f23 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -213,10 +213,10 @@ end function is_contact_subscribed(username, host, jid) do local selfjid = username.."@"..host; - local subscription = _get_online_roster_subscription(selfjid, jid); - if subscription then return (subscription == "both" or subscription == "from"); end - local subscription = _get_online_roster_subscription(jid, selfjid); - if subscription then return (subscription == "both" or subscription == "to"); end + local user_subscription = _get_online_roster_subscription(selfjid, jid); + if user_subscription then return (user_subscription == "both" or user_subscription == "from"); end + local contact_subscription = _get_online_roster_subscription(jid, selfjid); + if contact_subscription then return (contact_subscription == "both" or contact_subscription == "to"); end end local roster, err = load_roster(username, host); local item = roster[jid]; |