Preparing the release 3.1.7 pl 1 3.1.7_pl_1
authorAlexander Ebert <ebert@woltlab.com>
Tue, 1 Jan 2019 22:08:08 +0000 (23:08 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 1 Jan 2019 22:08:08 +0000 (23:08 +0100)
1  2 
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/page/handler/TDecoratedCategoryLookupPageHandler.class.php

index 96a2a23de18ffa1ebdba93d6b18d9d3b18a6b8f0,c4fbc011af92006ac39eff9d7b32b77e004f6185..7da5c6d60b45de5efd19d00a47ee17e0d86e4715
@@@ -5,7 -5,7 +5,7 @@@
                <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.7</version> <!-- codename: tornado -->
 -              <version>3.0.19 pl 1</version> <!-- codename: vortex -->
++              <version>3.1.7 pl 1</version> <!-- codename: tornado -->
                <date>2019-01-01</date>
        </packageinformation>
        
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
 -      <instructions type="update" fromversion="2.1.24">
 -              <instruction type="file">files_pre_update.tar</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
 -              <instruction type="sql">update_part1.sql</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_noop.php</instruction>
 -              
 -              <instruction type="file">files.tar</instruction>
 -              <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.0_appConfig.php</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_columnLength.php</instruction>
 -              <instruction type="sql" run="standalone">update_1.sql</instruction>
 -              <instruction type="sql" run="standalone">update_2.sql</instruction>
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_dropColumns.php</instruction>
 -              <instruction type="sql" run="standalone">update_3.sql</instruction>
 -              <instruction type="sql" run="standalone">update_4.sql</instruction>
 -              <instruction type="sql" run="standalone">update_5.sql</instruction>
 -              
 -              <instruction type="acpTemplate">acptemplates.tar</instruction>
 -              <instruction type="template">templates.tar</instruction>
 -              <instruction type="language" run="standalone">language/*.xml</instruction>
 -              
 -              <instruction type="packageInstallationPlugin">packageInstallationPlugin.xml</instruction>
 -              <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 -              <instruction type="objectType">objectType.xml</instruction>
 -              <instruction type="aclOption">aclOption.xml</instruction>
 -              <instruction type="acpMenu">acpMenu.xml</instruction>
 -              <instruction type="acpSearchProvider">acpSearchProvider.xml</instruction>
 -              <instruction type="bbcode">bbcode.xml</instruction>
 -              <instruction type="clipboardAction">clipboardAction.xml</instruction>
 -              <instruction type="coreObject">coreObject.xml</instruction>
 -              <instruction type="cronjob">cronjob.xml</instruction>
 -              <instruction type="eventListener">eventListener.xml</instruction>
 -              <instruction type="option">option.xml</instruction>
 -              <instruction type="smiley">smiley.xml</instruction>
 -              <instruction type="userGroupOption">userGroupOption.xml</instruction>
 -              <instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
 -              <instruction type="userOption">userOption.xml</instruction>
 -              
 -              <instruction type="page">page.xml</instruction>
 -              <instruction type="menu">menu.xml</instruction>
 -              <instruction type="menuItem">menuItem.xml</instruction>
 -              <instruction type="box">box.xml</instruction>
 +      <instructions type="update" fromversion="3.0.*">
 +              <instruction type="file">files_pre_sql.tar</instruction>
                
 -              <instruction type="style">defaultStyle.tar</instruction>
 +              <!-- version guard -->
 +              <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.1_preUpdate.php</instruction>
 +              
 +              <!-- prevent issues caused by early flushes of the `options.inc.php` -->
 +              <instruction type="option" />
 +              
 +              <instruction type="acpTemplate" />
 +              <instruction type="template" />
 +              
 +              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_addColumn.php</instruction>
 +              
 +              <instruction type="sql" run="standalone">update_3.1_1.sql</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_2.sql</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_3.sql</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_4.sql</instruction>
 +              
 +              <instruction type="file" run="standalone" />
 +              
 +              <instruction type="language" run="standalone" />
 +              
 +              <instruction type="acpMenu" />
 +              <instruction type="bbcode" />
 +              <instruction type="clipboardAction" />
 +              <instruction type="cronjob" />
 +              <instruction type="eventListener" />
 +              <instruction type="objectTypeDefinition" />
 +              <instruction type="objectType" />
 +              <instruction type="userGroupOption" />
 +              <instruction type="userNotificationEvent" />
 +              <instruction type="userOption" />
                
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 +              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_pageSearchIndex.php</instruction>
 +              
 +              <instruction type="page" />
 +              <!-- contains a reference to a new page -->
 +              <instruction type="menuItem" />
 +              
 +              <instruction type="packageInstallationPlugin" />
 +              <!-- new pip -->
 +              <instruction type="mediaProvider" />
 +              
 +              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_postUpgrade.php</instruction>
 +              
 +              <instruction type="style">defaultStyle.tar</instruction>
        </instructions>
        
-       <!-- Warning: Keep both update blocks in sync! -->
-       <instructions type="update" fromversion="3.1.6">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
 -      <instructions type="update" fromversion="3.0.19">
++      <instructions type="update" fromversion="3.1.7">
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-               
-               <instruction type="language" />
-       </instructions>
-       <instructions type="update" fromversion="3.1.6 pl 1">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-               <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-               
-               <instruction type="language" />
        </instructions>
  </package>
index a2c23fabf3b076bda5965ddabe897999729b6295,92e4f4974cb60052d793b7243f2c4a262571f239..754ab1e38740fb487469ffc70edb2341eeff254e
@@@ -48,10 -47,7 +48,10 @@@ if (!@ini_get('date.timezone')) 
  }
  
  // define current woltlab suite version
- define('WCF_VERSION', '3.1.7');
 -define('WCF_VERSION', '3.0.19 pl 1');
++define('WCF_VERSION', '3.1.7 pl 1');
 +
 +// define current API version
 +define('WSC_API_VERSION', 2018);
  
  // define current unix timestamp
  define('TIME_NOW', time());