<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -132,20 +132,23 @@ get_options_xform(Lang, Options) -&gt;
 					   children = [?XMLCDATA(?NS_PUBSUB_SUBSCRIBE_OPTIONS_s)]}]}] ++ XFields}}.
 
 parse_options_xform(XFields) -&gt;
-    case exmpp_xml:get_child_elements(XFields) of
-	[] -&gt; {result, []};
-	[#xmlel{name = 'x'} = XEl] -&gt;
-	    case jlib:parse_xdata_submit(XEl) of
-		XData when is_list(XData) -&gt;
-		    case set_xoption(XData, []) of
-			Opts when is_list(Opts) -&gt; {result, Opts};
-			Other		   -&gt; Other
-		    end;
-		Other -&gt;
-		    Other
-	    end;
-	Other -&gt;
-	    Other
+    case XFields of
+  [] -&gt;  {result, []};
+  _  -&gt;  case exmpp_xml:get_child_elements(XFields) of
+	    [] -&gt; {result, []};
+	    [#xmlel{name = 'x'} = XEl] -&gt;
+	        case jlib:parse_xdata_submit(XEl) of
+		    XData when is_list(XData) -&gt;
+		        case set_xoption(XData, []) of
+			    Opts when is_list(Opts) -&gt; {result, Opts};
+			    Other		   -&gt; Other
+		        end;
+		    Other -&gt;
+		        Other
+	        end;
+	    Other -&gt;
+	        Other
+        end
     end.
 
 %%====================================================================</diff>
      <filename>src/mod_pubsub/pubsub_subscription_odbc.erl</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>02c4221ad8cdf458505ec6a6c572bb5bb4a6e7bc</id>
    </parent>
  </parents>
  <author>
    <name>cromain</name>
    <email>cromain@1613c18e-e6f4-0310-972c-c3fad1d2be73</email>
  </author>
  <url>http://github.com/bjc/ejabberd/commit/d5fc52d39686bc5406be0edb08f07b910b100e53</url>
  <id>d5fc52d39686bc5406be0edb08f07b910b100e53</id>
  <committed-date>2009-11-06T06:36:41-08:00</committed-date>
  <authored-date>2009-11-06T06:36:41-08:00</authored-date>
  <message>minor bug fixes related to the use/conversion of/to exmpp (thanks to Karim Gemayel)

git-svn-id: https://svn.process-one.net/ejabberd/trunk@2733 1613c18e-e6f4-0310-972c-c3fad1d2be73</message>
  <tree>f0e0bf3f2b2c68a84d87c9ad07c34dd71555d58d</tree>
  <committer>
    <name>cromain</name>
    <email>cromain@1613c18e-e6f4-0310-972c-c3fad1d2be73</email>
  </committer>
</commit>
