From 2401b97e11a2a758c7de244a1cb92b626a606dfc Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 14 May 2018 23:28:46 +0200
Subject: [PATCH] XEP-0060: Add missing optional dataform in <default/> schema.

---
 xep-0060.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/xep-0060.xml b/xep-0060.xml
index 642be8d2..e3178725 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -6541,6 +6541,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    xmlns:xdata='jabber:x:data'
     targetNamespace='http://jabber.org/protocol/pubsub'
     xmlns='http://jabber.org/protocol/pubsub'
     elementFormDefault='qualified'>
@@ -6635,21 +6636,20 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
 
   <xs:element name='default'>
     <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base='empty'>
-          <xs:attribute name='node' type='xs:string' use='optional'/>
-          <xs:attribute name='type'
-                        use='optional'
-                        default='leaf'>
-            <xs:simpleType>
-              <xs:restriction base='xs:NCName'>
-                <xs:enumeration value='collection'/>
-                <xs:enumeration value='leaf'/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-        </xs:extension>
-      </xs:simpleContent>
+      <xs:choice minOccurs='0'>
+        <xs:element ref='xdata:x'/>
+      </xs:choice>
+      <xs:attribute name='node' type='xs:string' use='optional'/>
+      <xs:attribute name='type'
+                    use='optional'
+                    default='leaf'>
+        <xs:simpleType>
+          <xs:restriction base='xs:NCName'>
+            <xs:enumeration value='collection'/>
+            <xs:enumeration value='leaf'/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>