From: Alexander Ebert Date: Thu, 25 Jun 2015 17:33:50 +0000 (+0200) Subject: Preparing internal release 2.1.5 X-Git-Tag: 2.1.5~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0bfcbf08509f6dc3b132bd35839248da2aaa3845;p=GitHub%2FWoltLab%2FWCF.git Preparing internal release 2.1.5 --- diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index 70a1d048c8..66239f8662 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -5,8 +5,8 @@ 1 - 2.1.4 - 2015-05-19 + 2.1.5 + 2015-06-25 @@ -135,17 +135,9 @@ acp/rebuild_comments_com.woltlab.wcf_2.1.php - + acptemplates_update.tar files_update.tar - templates_update.tar - language/*.xml - - bbcode.xml - objectType.xml - option.xml - - acp/rebuild_attachments_com.woltlab.wcf_2.1.4.php diff --git a/com.woltlab.wcf/update_212.sql b/com.woltlab.wcf/update_212.sql deleted file mode 100644 index 7ea7d1c6b9..0000000000 --- a/com.woltlab.wcf/update_212.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE wcf1_bbcode_media_provider SET html = '' 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 index c64d355662..0000000000 --- a/wcfsetup/install/files/acp/rebuild_attachments_com.woltlab.wcf_2.1.4.php +++ /dev/null @@ -1,91 +0,0 @@ - - * @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 e6ed30d7e6..91915f1f3d 100644 --- 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());