From 3423f7bc7463058886f8310a0095ce40a5ea2c47 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 17 Jul 2014 17:44:11 +0200
Subject: [PATCH] Bugfix. fixes #180

---
 converse.js      | 4 ++--
 docs/CHANGES.rst | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/converse.js b/converse.js
index ec460d15d..990f9dcfe 100644
--- a/converse.js
+++ b/converse.js
@@ -3779,13 +3779,13 @@
         },
         'getRID': function () {
             if (converse.expose_rid_and_sid && typeof converse.connection !== "undefined") {
-                return converse.connection._proto.rid;
+                return converse.connection.rid || converse.connection._proto.rid;
             }
             return null;
         },
         'getSID': function () {
             if (converse.expose_rid_and_sid && typeof converse.connection !== "undefined") {
-                return converse.connection._proto.sid;
+                return converse.connection.sid || converse.connection._proto.sid;
             }
             return null;
         },
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 5199bb98c..005da2204 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -25,6 +25,7 @@ Changelog
 * #132 Support for `XEP-0280: Message Carbons <https://xmpp.org/extensions/xep-0280.html'>`_.
   Configured via `enable_message_carbons <https://conversejs.org/docs/html/index.html#enable_message_carbons>`_ [hejazee]
 * #176 Add support for caching in sessionStorage as opposed to localStorage. [jcbrand]
+* #180 RID and SID undefined [g8g3]
 * #191 No messages history [heban]
 * #192 Error: xhr_user_search_url is not defined. [jcbrand]