From 2023bc185c095056d25918934e90f3d464cad029 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 22 Dec 2017 11:47:54 +0100
Subject: [PATCH] Preparing release 3.1.0 Beta 5

---
 com.woltlab.wcf/package.xml                   | 12 ++---
 com.woltlab.wcf/update_3.1.0_beta_4.sql       |  1 -
 ...com.woltlab.wcf_3.1.0_beta_4_addColumn.php | 48 -------------------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 4 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 com.woltlab.wcf/update_3.1.0_beta_4.sql
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.0_beta_4_addColumn.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 95710f51110..9b7b0634c43 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>3.1.0 Beta 4</version> <!-- codename: tornado -->
-		<date>2017-12-11</date>
+		<version>3.1.0 Beta 5</version> <!-- codename: tornado -->
+		<date>2017-12-22</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -48,19 +48,13 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="3.1.0 Beta 3">
+	<instructions type="update" fromversion="3.1.0 Beta 4">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		
-		<instruction type="sql">update_3.1.0_beta_4.sql</instruction>
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_3.1.0_beta_4_addColumn.php</instruction>
-		
 		<instruction type="language" />
 		
-		<instruction type="mediaProvider" />
-		<instruction type="objectType" />
-		<instruction type="option" />
 		<instruction type="userGroupOption" />
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_3.1.0_beta_4.sql b/com.woltlab.wcf/update_3.1.0_beta_4.sql
deleted file mode 100644
index aa2ff37d3e6..00000000000
--- a/com.woltlab.wcf/update_3.1.0_beta_4.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE wcf1_style ADD coverPhotoExtension VARCHAR(4) NOT NULL DEFAULT '';
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.0_beta_4_addColumn.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.0_beta_4_addColumn.php
deleted file mode 100644
index e0476e16dad..00000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.0_beta_4_addColumn.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-use wcf\system\package\SplitNodeException;
-use wcf\system\WCF;
-use wcf\util\StringUtil;
-
-/**
- * Adds database columns, each row in the data section
- * below is executed in a separate request.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2017 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core
- */
-$data = <<<DATA
-ALTER TABLE wcf1_user ADD COLUMN coverPhotoHash CHAR(40) DEFAULT NULL, ADD COLUMN coverPhotoExtension VARCHAR(4) NOT NULL DEFAULT '', ADD COLUMN disableCoverPhoto TINYINT(1) NOT NULL DEFAULT 0, ADD COLUMN disableCoverPhotoReason TEXT, ADD COLUMN disableCoverPhotoExpires INT(10) NOT NULL DEFAULT 0;
-DATA;
-
-$lines = explode("\n", StringUtil::trim($data));
-
-$rebuildData = WCF::getSession()->getVar('__wcfUpdateAddColumns');
-if ($rebuildData === null) {
-	$rebuildData = [
-		'i' => 0,
-		'max' => count($lines)
-	];
-}
-
-// MySQL adds a column by creating a new table in the
-// background and copying over all the data afterwards.
-// 
-// Using a single `ALTER TABLE` to add multiple columns
-// results in the same runtime, because copying the table
-// is what actually takes ages.
-$statement = WCF::getDB()->prepareStatement(str_replace('wcf1_', 'wcf'.WCF_N.'_', $lines[$rebuildData['i']]));
-$statement->execute();
-
-$rebuildData['i']++;
-
-if ($rebuildData['i'] === $rebuildData['max']) {
-	WCF::getSession()->unregister('__wcfUpdateAddColumns');
-}
-else {
-	WCF::getSession()->register('__wcfUpdateAddColumns', $rebuildData);
-	
-	// call this script again
-	throw new SplitNodeException();
-}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index c4972844b09..66721f6a9fb 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -48,7 +48,7 @@
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0 Beta 4');
+define('WCF_VERSION', '3.1.0 Beta 5');
 
 // define current API version
 define('WSC_API_VERSION', 2018);