Preparing internal release 2.1.5

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 70a1d048c86213709ee0f1eaddd10abdb48f2689..66239f8662f59681226352c2c4d4e6edda75456f 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.4</version> <!-- codename: typhoon -->
-               <date>2015-05-19</date>
+               <version>2.1.5</version> <!-- codename: typhoon -->
+               <date>2015-06-25</date>
        </packageinformation>
        
        <authorinformation>
@@ -135,17 +135,9 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.3">
+       <instructions type="update" fromversion="2.1.4">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-               
                <instruction type="language" run="standalone">language/*.xml</instruction>
-               
-               <instruction type="bbcode">bbcode.xml</instruction>
-               <instruction type="objectType">objectType.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               
-               <instruction type="script" run="standalone">acp/rebuild_attachments_com.woltlab.wcf_2.1.4.php</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_212.sql b/com.woltlab.wcf/update_212.sql
deleted file mode 100644 (file)
index 7ea7d1c..0000000
--- a/com.woltlab.wcf/update_212.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE wcf1_bbcode_media_provider SET html = '<iframe style="max-width:100%;" width="560" height="315" src="https://www.youtube.com/embed/{$ID}?wmode=transparent{$start}" allowfullscreen></iframe>' WHERE title = 'YouTube';

diff --git a/wcfsetup/install/files/acp/rebuild_attachments_com.woltlab.wcf_2.1.4.php b/wcfsetup/install/files/acp/rebuild_attachments_com.woltlab.wcf_2.1.4.php
deleted file mode 100644 (file)
index c64d355..0000000
--- a/wcfsetup/install/files/acp/rebuild_attachments_com.woltlab.wcf_2.1.4.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-use wcf\data\attachment\AttachmentList;
-use wcf\system\package\SplitNodeException;
-use wcf\system\WCF;
-
-/**
- * Checks the filesize of all image attachments since the release of WCF 2.1 due
- * to issues with rotated images whose filesize is incorrect.
- * 
- * @author     Matthias Schmidt
- * @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
- */
-$minimumAttachmentTime = 1425219870; // time of the release note
-
-$attachmentsPerRun = 100;
-$rebuildData = WCF::getSession()->getVar('__wcfUpdateRebuildAttachments');
-if ($rebuildData === null) {
-       $sql = "SELECT  COUNT(*)
-               FROM    wcf".WCF_N."_attachment
-               WHERE   isImage = ?
-                       AND uploadTime >= ?";
-       $statement = WCF::getDB()->prepareStatement($sql);
-       $statement->execute(array(
-               1,
-               $minimumAttachmentTime
-       ));
-       $count = $statement->fetchColumn();
-       
-       $rebuildData = array(
-               'i' => 0,
-               'max' => 0
-       );
-       
-       if ($count) {
-               $rebuildData['max'] = ceil($count / $attachmentsPerRun);
-       }
-}
-
-if ($rebuildData['max']) {
-       // get attachment file data
-       $attachmentList = new AttachmentList();
-       $attachmentList->getConditionBuilder()->add('isImage = ?', array(1));
-       $attachmentList->getConditionBuilder()->add('uploadTime >= ?', array($minimumAttachmentTime));
-       $attachmentList->sqlOffset = $rebuildData['i'] * $attachmentsPerRun;
-       $attachmentList->sqlLimit = $attachmentsPerRun;
-       $attachmentList->readObjects();
-       
-       if (!count($attachmentList)) {
-               // all relevant attachments have been processed
-               WCF::getSession()->unregister('__wcfUpdateRebuildAttachments');
-       }
-       else {
-               $attachmentUpdates = array();
-               foreach ($attachmentList as $attachment) {
-                       if (!file_exists($attachment->getLocation())) {
-                               // missing files should not cause the update to fail
-                               continue;
-                       }
-                       
-                       $filesize = filesize($attachment->getLocation());
-                       if ($filesize != $attachment->filesize) {
-                               $attachmentUpdates[$attachment->attachmentID] = $filesize;
-                       }
-               }
-               
-               if (!empty($attachmentUpdates)) {
-                       $sql = "UPDATE  wcf".WCF_N."_attachment
-                               SET     filesize = ?
-                               WHERE   attachmentID = ?";
-                       $statement = WCF::getDB()->prepareStatement($sql);
-                       
-                       WCF::getDB()->beginTransaction();
-                       foreach ($attachmentUpdates as $attachmentID => $filesize) {
-                               $statement->execute(array(
-                                       $filesize,
-                                       $attachmentID
-                               ));
-                       }
-                       WCF::getDB()->commitTransaction();
-               }
-               
-               // update rebuiled data
-               $rebuildData['i']++;
-               WCF::getSession()->register('__wcfUpdateRebuildAttachments', $rebuildData);
-               
-               throw new SplitNodeException();
-       }
-}

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index e6ed30d7e6f63827865b6d9a57cb8a1ddd9e47cf..91915f1f3d83814af4bf9083d017191c392bbba7 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.4 (Typhoon)');
+define('WCF_VERSION', '2.1.5 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());