aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-01-22 13:22:50 +0000
committerMatthew Wild <mwild1@gmail.com>2016-01-22 13:22:50 +0000
commitb0864f247d26d45d1a2e6f0dc4958254ca8bcb47 (patch)
tree8713f897d9a021ab269f7ceca81a92effec5a967
parent0c0c421a8d90e54e566a2c8ff00544c992336cfc (diff)
parentf9bec76a46fe06d38d82f11489a191574302bc21 (diff)
downloadprosody-b0864f247d26d45d1a2e6f0dc4958254ca8bcb47.tar.gz
prosody-b0864f247d26d45d1a2e6f0dc4958254ca8bcb47.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_admin_telnet.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index bb5a13c3..916b29a3 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -594,11 +594,11 @@ local function show_c2s(callback)
c2s:sort(function(a, b)
if a.host == b.host then
if a.username == b.username then
- return a.resource or "" > b.resource or "";
+ return (a.resource or "") > (b.resource or "");
end
- return a.username or "" > b.username or "";
+ return (a.username or "") > (b.username or "");
end
- return a.host or "" > b.host or "";
+ return (a.host or "") > (b.host or "");
end):map(function (session)
callback(get_jid(session), session)
end);