From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 6 Nov 2016 16:01:01 +0000 (+0100)
Subject: Fixed renamed permission canInstallPackage
X-Git-Tag: 3.0.0_Beta_5~66^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e19e2c7ee3117704175fba4d15cda0f266d67a1;p=GitHub%2FWoltLab%2FWCF.git

Fixed renamed permission canInstallPackage
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 82721a2bc0..6d8bbf516c 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -54,7 +54,7 @@
 	<instructions type="update" fromversion="2.1.12">
 		<instruction type="file">files_pre_update.tar</instruction>
 		<instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
-		<instruction type="sql">update_page.sql</instruction>
+		<instruction type="sql">update_part1.sql</instruction>
 		
 		<instruction type="file" run="standalone">files.tar</instruction>
 		<instruction type="sql" run="standalone">update.sql</instruction>
diff --git a/com.woltlab.wcf/update_page.sql b/com.woltlab.wcf/update_page.sql
deleted file mode 100644
index 4ddee5e241..0000000000
--- a/com.woltlab.wcf/update_page.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-DROP TABLE IF EXISTS wcf1_page;
-CREATE TABLE wcf1_page (
-	pageID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	parentPageID INT(10),
-	identifier VARCHAR(255) NOT NULL,
-	name VARCHAR(255) NOT NULL,
-	pageType VARCHAR(255) NOT NULL,
-	isDisabled TINYINT(1) NOT NULL DEFAULT 0,
-	isLandingPage TINYINT(1) NOT NULL DEFAULT 0,
-	isMultilingual TINYINT(1) NOT NULL DEFAULT 0,
-	originIsSystem TINYINT(1) NOT NULL DEFAULT 0,
-	packageID INT(10) NOT NULL,
-	applicationPackageID INT(10),
-	controller VARCHAR(255) NOT NULL DEFAULT '',
-	handler VARCHAR(255) NOT NULL DEFAULT '',
-	controllerCustomURL VARCHAR(255) NOT NULL DEFAULT '',
-	requireObjectID TINYINT(1) NOT NULL DEFAULT 0,
-	hasFixedParent TINYINT(1) NOT NULL DEFAULT 0,
-	lastUpdateTime INT(10) NOT NULL DEFAULT 0,
-	permissions TEXT NULL,
-	options TEXT NULL
-);
-
-DROP TABLE IF EXISTS wcf1_page_content;
-CREATE TABLE wcf1_page_content (
-	pageContentID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	pageID INT(10) NOT NULL,
-	languageID INT(10),
-	title VARCHAR(255) NOT NULL,
-	content MEDIUMTEXT,
-	metaDescription TEXT,
-	metaKeywords TEXT,
-	customURL VARCHAR(255) NOT NULL,
-	hasEmbeddedObjects TINYINT(1) NOT NULL DEFAULT 0,
-	
-	UNIQUE KEY (pageID, languageID)
-);
diff --git a/com.woltlab.wcf/update_part1.sql b/com.woltlab.wcf/update_part1.sql
new file mode 100644
index 0000000000..8481f514ca
--- /dev/null
+++ b/com.woltlab.wcf/update_part1.sql
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS wcf1_page;
+CREATE TABLE wcf1_page (
+	pageID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	parentPageID INT(10),
+	identifier VARCHAR(255) NOT NULL,
+	name VARCHAR(255) NOT NULL,
+	pageType VARCHAR(255) NOT NULL,
+	isDisabled TINYINT(1) NOT NULL DEFAULT 0,
+	isLandingPage TINYINT(1) NOT NULL DEFAULT 0,
+	isMultilingual TINYINT(1) NOT NULL DEFAULT 0,
+	originIsSystem TINYINT(1) NOT NULL DEFAULT 0,
+	packageID INT(10) NOT NULL,
+	applicationPackageID INT(10),
+	controller VARCHAR(255) NOT NULL DEFAULT '',
+	handler VARCHAR(255) NOT NULL DEFAULT '',
+	controllerCustomURL VARCHAR(255) NOT NULL DEFAULT '',
+	requireObjectID TINYINT(1) NOT NULL DEFAULT 0,
+	hasFixedParent TINYINT(1) NOT NULL DEFAULT 0,
+	lastUpdateTime INT(10) NOT NULL DEFAULT 0,
+	permissions TEXT NULL,
+	options TEXT NULL
+);
+
+DROP TABLE IF EXISTS wcf1_page_content;
+CREATE TABLE wcf1_page_content (
+	pageContentID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	pageID INT(10) NOT NULL,
+	languageID INT(10),
+	title VARCHAR(255) NOT NULL,
+	content MEDIUMTEXT,
+	metaDescription TEXT,
+	metaKeywords TEXT,
+	customURL VARCHAR(255) NOT NULL,
+	hasEmbeddedObjects TINYINT(1) NOT NULL DEFAULT 0,
+	
+	UNIQUE KEY (pageID, languageID)
+);
+
+UPDATE wcf1_user_group_option SET optionName = 'admin.configuration.package.canInstallPackage', categoryName = 'admin.configuration.package' WHERE optionName = 'admin.system.package.canInstallPackage';
\ No newline at end of file