Merging addslashes() change from stable.

diff --git a/mod/chat/chatd.php b/mod/chat/chatd.php
index 5d9f8a92d24b189de669106386c13a50c02e9070..f940efe49a28aec707bfc7e7d879b832c75dd098 100755 (executable)
--- a/mod/chat/chatd.php
+++ b/mod/chat/chatd.php
@@ -408,9 +408,16 @@ class ChatDaemon {
                     break;
                 }
 
+                // A slight hack to prevent malformed SQL inserts
+                $origmsg = $msg->message;
+                $msg->message = addslashes($msg->message);
+
                 // Commit to DB
                 insert_record('chat_messages', $msg);
 
+                // Undo the hack
+                $msg->message = $origmsg;
+
                 // OK, now push it out to all users
                 $this->message_broadcast($msg, $this->sets_info[$sessionid]['user']);