Preparing internal release 2.1.0

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 090ff67e2108d2c602b41a040a630235a18bc704..b7acbf9e7204da767daf3a3babd97b4b71c09701 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.1.0 RC 2</version> <!-- codename: typhoon -->
-               <date>2015-02-22</date>
+               <version>2.1.0</version> <!-- codename: typhoon -->
+               <date>2015-02-26</date>
        </packageinformation>
        
        <authorinformation>
@@ -89,15 +89,15 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.0 RC 1">
-               <instruction type="file">files_update.tar</instruction>
+       <instructions type="update" fromversion="2.1.0 RC 2">
+               <instruction type="file" run="standalone">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="script">acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php</instruction>
+               <instruction type="language" run="standalone">language/*.xml</instruction>
                
+               <instruction type="bbcode">bbcode.xml</instruction>
+               <instruction type="coreObject">coreObject.xml</instruction>
                <instruction type="option">option.xml</instruction>
                <instruction type="userGroupOption">userGroupOption.xml</instruction>
-               
-               <instruction type="language" run="standalone">language/*.xml</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php b/wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php
deleted file mode 100644 (file)
index 06214f7..0000000
--- a/wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-use wcf\system\WCF;
-
-/**
- * @author     Alexander Ebert
- * @copyright  2001-2015 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @category   Community Framework
- */
-
-// fix superfluous group ID in accessibleGroups list
-$sql = "SELECT groupID
-       FROM    wcf".WCF_N."_user_group";
-$statement = WCF::getDB()->prepareStatement($sql);
-$statement->execute();
-$validGroupIDs = array();
-while ($row = $statement->fetchArray()) {
-       $validGroupIDs[] = $row['groupID'];
-}
-
-$sql = "SELECT *
-       FROM    wcf".WCF_N."_user_group_option_value
-       WHERE   optionID = (
-                       SELECT  optionID
-                       FROM    wcf".WCF_N."_user_group_option
-                       WHERE   optionName = 'admin.user.accessibleGroups'
-               )";
-$statement = WCF::getDB()->prepareStatement($sql);
-$statement->execute();
-$updateData = array();
-$optionID = 0;
-while ($row = $statement->fetchArray()) {
-       $optionID = $row['optionID'];
-       $groupIDs = explode(',', $row['optionValue']);
-       $newGroupIDs = array();
-       for ($i = 0, $length = count($groupIDs); $i < $length; $i++) {
-               $groupID = $groupIDs[$i];
-               if (in_array($groupID, $validGroupIDs)) {
-                       $newGroupIDs[] = $groupID;
-               }
-       }
-       
-       $updateData[$row['groupID']] = implode(',', $newGroupIDs);
-}
-
-$sql = "UPDATE wcf".WCF_N."_user_group_option_value
-       SET     optionValue = ?
-       WHERE   groupID = ?
-               AND optionID = ?";
-$statement = WCF::getDB()->prepareStatement($sql);
-
-WCF::getDB()->beginTransaction();
-foreach ($updateData as $groupID => $optionValue) {
-       $statement->execute(array(
-               $optionValue,
-               $groupID,
-               $optionID
-       ));
-}
-WCF::getDB()->commitTransaction();