Merging MOODLE_14_STABLE changes.

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 2bba3c2d511db6a6a92137c5f5bbd8cfeadde02d..dc7a40e66e6807131f609600550bb4d427ef9466 100644 (file)
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -366,9 +366,10 @@ function chat_delete_old_users() {
     global $CFG;
 
     $timeold = time() - $CFG->chat_old_ping;
+    $query = "lastping < '$timeold' AND version != 'sockets'";
 
-    if ($oldusers = get_records_select("chat_users", "lastping < '$timeold'") ) {
-        delete_records_select("chat_users", "lastping < '$timeold'");
+    if ($oldusers = get_records_select("chat_users", $query) ) {
+        delete_records_select("chat_users", $query);
         foreach ($oldusers as $olduser) {
             $message->chatid = $olduser->chatid;
             $message->userid = $olduser->userid;