Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)

SVN Revision: 1911

diff --git a/ChangeLog b/ChangeLog
index 907eda0351ce326777960df3d906a4bb9435af0c..73a2dbb5c459b9e9bde1b35b4f79d5be1c0b7261 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-23  Christophe Romain <christophe.romain@process-one.net>
+
+       * src/ejabberd_c2s.erl: Do not call mod_caps:clear_caps, this previous
+       optimization is too agressive and breaks PubSub/PEP standard behavior
+       (EJAB-854)
+
 2009-02-21  Badlop  <badlop@process-one.net>
 
        * src/mod_muc/mod_muc_room.erl: Owner of a password protected room

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 8e624612d6b2ce86211fcede3d11c0cc3234e321..e63e9c3f2222b6e0d657c42dca91016e0eca1378 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1113,7 +1113,9 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
                                %% Note contact availability
                                case xml:get_attr_s("type", Attrs) of
                                    "unavailable" -> 
-                                       mod_caps:clear_caps(From);
+                                       %mod_caps:clear_caps(From);
+                                       % caps clear disabled cause it breaks things
+                                       ok;
                                    _ -> 
                                        Caps = mod_caps:read_caps(Els),
                                        mod_caps:note_caps(StateData#state.server, From, Caps)