Default pubsub messages to headline if nothing is configured (thanks to Brian Cully...

SVN Revision: 2654

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index c7815c4d5e5a2cca53b807c1e2588b5a37063411..d68edcaa26015693a9f2c1d4d6fb8ceef0c70e09 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -3038,7 +3038,7 @@ get_options_for_subs(NodeID, Subs) ->
 %    end
 
 broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza) ->
-    NotificationType = get_option(NodeOptions, notification_type),
+    NotificationType = get_option(NodeOptions, notification_type, headline),
     BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
     From = service_jid(Host),
     Stanza = case NotificationType of

diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl
index 06e831bcfcd030d20ac46a5f1b3a91d563d66378..4d2fee28515278ec24651bb4f4c72223098b671b 100644 (file)
--- a/src/mod_pubsub/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub/mod_pubsub_odbc.erl
@@ -2868,7 +2868,7 @@ get_options_for_subs(NodeID, Subs) ->
 %    end
 
 broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza) ->
-    NotificationType = get_option(NodeOptions, notification_type),
+    NotificationType = get_option(NodeOptions, notification_type, headline),
     BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
     From = service_jid(Host),
     Stanza = case NotificationType of

diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch
index ffc65541e79bdae04467853d6146139b14958b69..58401a9563eb47993b9e062267275da6682bf845 100644 (file)
--- a/src/mod_pubsub/pubsub_odbc.patch
+++ b/src/mod_pubsub/pubsub_odbc.patch
@@ -1,5 +1,5 @@
---- mod_pubsub.erl     2009-10-06 17:17:31.000000000 +0200
-+++ mod_pubsub_odbc.erl        2009-10-06 17:18:05.000000000 +0200
+--- mod_pubsub.erl     2009-10-12 11:03:50.000000000 +0200
++++ mod_pubsub_odbc.erl        2009-10-12 11:04:09.000000000 +0200
 @@ -45,7 +45,7 @@
  %%% TODO
  %%% plugin: generate Reply (do not use broadcast atom anymore)