diff --git a/build/build.xml b/build/build.xml index 2e65539035..789e184028 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 27275d4cfc..0e6a963f98 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -68,6 +68,7 @@
  • Changes since 3.1.0-a2
  • Changes since 3.1.0-a1
  • Changes since 3.0.x
    • +
  • Changes since 3.0.13-PL1
  • Changes since 3.0.13
  • Changes since 3.0.12
  • Changes since 3.0.11
    • @@ -2326,6 +2327,31 @@
  • [PHPBB3-11870] - No longer exclude ./phpBB/phpbb/search/fulltext_*.php from code coverage
  • [PHPBB3-11885] - Add migrations for 3.0.12-RCx and 3.0.12
  • [PHPBB3-11913] - Apply reorganisation of download.phpbb.com to build_announcement.php
    • + + +

    Changes since 3.0.13-PL1

    + +

    Bug

    +
      +
    • [PHPBB3-13348] - sql_freeresult() should be called in feed base class
      • +
    • [PHPBB3-13414] - download/file.php sends Content-Length header even when issuing 304 Not Modified
      • +
    • [PHPBB3-13555] - Poll options preview rendered incorrectly by <br /> collision
      • +
    • [PHPBB3-13568] - Imagick path validated as relative path although ACP asks for absolute path
      • +
    • [PHPBB3-13617] - Bot session continuation with invalid f= query parameter causes SQL error
      • +
    • [PHPBB3-13738] - Sami still refers to develop-* branches
      • +
    +

    Improvement

    +
      +
    • [PHPBB3-12089] - Make HTTP status code assertion failure messages more informative
      • +
    • [PHPBB3-13765] - Verify that SERVER_PROTOCOL has the expected format
      • +
    +

    Task

    +

    Changes since 3.0.13

    diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 2304070d6b..711f92b39d 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -303,7 +303,7 @@

    This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.

    -

    The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.0.12, you need the phpBB-3.0.12_to_3.0.13.zip/tar.bz2 file.

    +

    The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.0.13, you need the phpBB-3.0.13_to_3.0.14.zip/tar.bz2 file.

    To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

    diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_14_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_14_rc1.php new file mode 100644 index 0000000000..421ef06dd3 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_14_rc1.php @@ -0,0 +1,37 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v30x; + +class release_3_0_14_rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.0.14-RC1', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<'); + } + + static public function depends_on() + { + return array('\phpbb\db\migration\data\v30x\release_3_0_13'); + } + + public function update_data() + { + return array( + array('if', array( + phpbb_version_compare($this->config['version'], '3.0.14-RC1', '<'), + array('config.update', array('version', '3.0.14-RC1')), + )), + ); + } +}