From a1214d76fbb32dc884c4ca04f7a3b111d810463b Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 24 Dec 2016 09:42:36 +0100
Subject: [PATCH] Fix aclOption.xsd

---
 XSD/aclOption.xsd | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/XSD/aclOption.xsd b/XSD/aclOption.xsd
index b6f014870c..99a79fd2d1 100644
--- a/XSD/aclOption.xsd
+++ b/XSD/aclOption.xsd
@@ -25,7 +25,7 @@
 	<!-- delete element type -->
 	<xs:complexType name="delete">
 		<xs:choice maxOccurs="unbounded">
-			<xs:element name="category" type="category_delete" minOccurs="0" />
+			<xs:element name="optioncategory" type="category" minOccurs="0" />
 			<xs:element name="option" type="option_delete" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
@@ -33,21 +33,10 @@
 	<!-- categories import element type -->
 	<xs:complexType name="categories_import">
 		<xs:sequence>
-			<xs:element name="category" type="category_import" maxOccurs="unbounded" />
+			<xs:element name="category" type="category" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 	
-	<!-- imported/updated category element type -->
-	<xs:complexType name="category_import">
-		<xs:complexContent>
-			<xs:extension base="category_delete">
-				<xs:all>
-					<xs:element name="objecttype" type="woltlab_varchar_nullable" minOccurs="0" />
-				</xs:all>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
 	<!-- option import element type -->
 	<xs:complexType name="options_import">
 		<xs:sequence>
@@ -57,23 +46,26 @@
 	
 	<!-- imported/updated option element type -->
 	<xs:complexType name="option_import">
-		<xs:complexContent>
-			<xs:extension base="option_delete">
-				<xs:all>
-					<xs:element name="objecttype" type="woltlab_varchar_nullable" minOccurs="1" />
-					<xs:element name="categoryname" type="woltlab_varchar_nullable" minOccurs="0" />
-				</xs:all>
-			</xs:extension>
-		</xs:complexContent>
+		<xs:all>
+			<xs:element name="objecttype" type="woltlab_varchar_nullable" />
+			<xs:element name="categoryname" type="woltlab_varchar_nullable" minOccurs="0" />
+		</xs:all>
+		<xs:attribute name="name" type="woltlab_varchar" use="required" />
 	</xs:complexType>
 	
-	<!-- deleted category element type -->
-	<xs:complexType name="category_delete">
+	<!-- category element-->
+	<xs:complexType name="category">
+		<xs:all>
+			<xs:element name="objecttype" type="woltlab_varchar_nullable" />
+		</xs:all>
 		<xs:attribute name="name" type="woltlab_varchar" use="required" />
 	</xs:complexType>
 	
 	<!-- deleted option element type -->
 	<xs:complexType name="option_delete">
+		<xs:all>
+			<xs:element name="objecttype" type="woltlab_varchar_nullable" />
+		</xs:all>
 		<xs:attribute name="name" type="woltlab_varchar" use="required" />
 	</xs:complexType>
 </xs:schema>
\ No newline at end of file
-- 
2.20.1