Merge branch 'master' of github.com:processone/ejabberd

This commit is contained in:
Evgeniy Khramtsov 2013-06-18 04:05:31 +10:00
commit 6b060649c6
3 changed files with 2 additions and 1191 deletions

View File

@ -3036,7 +3036,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) ->
%% for automatic node creation. we'll take the default node type:
%% first listed into the plugins configuration option, or pep
Type = select_type(ServerHost, Host, Node),
case lists:member("auto-create", features(Type)) of
case lists:member(<<"auto-create">>, features(Type)) of
true ->
case create_node(Host, ServerHost, Node, Publisher, Type, Access, []) of
{result, [#xmlel{name = <<"pubsub">>,

View File

@ -2695,7 +2695,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) ->
%% for automatic node creation. we'll take the default node type:
%% first listed into the plugins configuration option, or pep
Type = select_type(ServerHost, Host, Node),
case lists:member("auto-create", features(Type)) of
case lists:member(<<"auto-create">>, features(Type)) of
true ->
case create_node(Host, ServerHost, Node, Publisher, Type, Access, []) of
{result, [#xmlel{name = <<"pubsub">>,

File diff suppressed because it is too large Load Diff