Preparing release 3.0.0 Beta 3

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 5bfa0e69278064a3dfb337ad6d5f6c63aa58f70d..427c6e8c71e65b6bad2829bd3a16c77ff97990be 100644 (file)
--- 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.0.0 Beta 2</version> <!-- codename: vortex -->
-               <date>2016-10-03</date>
+               <version>3.0.0 Beta 3</version> <!-- codename: vortex -->
+               <date>2016-10-17</date>
        </packageinformation>
        
        <authorinformation>
@@ -45,17 +45,17 @@
        
        <!-- TODO for updates: remember update_com.woltlab.wcf_3.0.0.php -->
        
-       <instructions type="update" fromversion="3.0.0 Beta 1">
+       <instructions type="update" fromversion="3.0.0 Beta 2">
+               
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="sql" run="standalone">update_3.0.0_beta_1.sql</instruction>
+               <instruction type="sql" run="standalone">update_3.0.0_beta_2.sql</instruction>
                
                <instruction type="language" />
                
                <instruction type="bbcode" />
-               <instruction type="objectTypeDefinition" />
                <instruction type="objectType" />
                <instruction type="option" />
        </instructions>

diff --git a/com.woltlab.wcf/update_3.0.0_beta_1.sql b/com.woltlab.wcf/update_3.0.0_beta_1.sql
deleted file mode 100644 (file)
index 85ac7e2..0000000
--- a/com.woltlab.wcf/update_3.0.0_beta_1.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-/* 4df658a44a7be0926c7f47510530c3774125acf6 */
-UPDATE wcf1_style_variable SET defaultValue = 'rgba(36, 66, 95, 1)' WHERE variableName = 'wcfHeaderMenuDropdownBackground';
-UPDATE wcf1_style_variable SET defaultValue = 'rgba(65, 121, 173, 1)' WHERE variableName = 'wcfHeaderMenuDropdownBackgroundActive';
-
-/* ba9a2bda5ae4a62836fbeda78ad342c1090475c9 */
-DELETE FROM wcf1_package_update_server;
-INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/vortex/', 'online', 0, NULL, 0, '', '');
-INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/vortex/', 'online', 0, NULL, 0, '', '');

diff --git a/com.woltlab.wcf/update_3.0.0_beta_2.sql b/com.woltlab.wcf/update_3.0.0_beta_2.sql
new file mode 100644 (file)
index 0000000..4681a93
--- /dev/null
+++ b/com.woltlab.wcf/update_3.0.0_beta_2.sql
@@ -0,0 +1,8 @@
+/* 1535ab4ef15edc761a02e91e25e28e866716c0b5 */
+ALTER TABLE wcf1_application DROP COLUMN cookiePath;
+
+/* d3925b67b9eba7eaef81887a0cf772dcfc5baa15 */
+UPDATE wcf1_style_variable SET defaultValue = 'rgba(217, 220, 222, 1)' WHERE variableName = 'wcfFooterCopyrightLink';
+
+/* 640a8bea2af6fd577932e9a083fc800c7d1a1190 */
+DELETE FROM wcf1_style_variable WHERE variableName IN ('wcfButtonBorder', 'wcfButtonBorderActive', 'wcfButtonDisabledBorder', 'wcfButtonPrimaryBorder', 'wcfButtonPrimaryBorderActive', 'wcfDropdownBorder');

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 42dba0e2e05d6cdfe3946c6a47f6bc94118773db..d8cd08d641798ab15234c234da449bb872745068 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.0.0 Beta 2');
+define('WCF_VERSION', '3.0.0 Beta 3');
 
 // define current unix timestamp
 define('TIME_NOW', time());