diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 13:03:04 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 13:03:04 +0200 |
| commit | 72a3bcd0484460d2aeb5610762e162ca30f24263 (patch) | |
| tree | 071c631f6c057bd225b43cb7cc4af27f44dc725a /phpBB/install/database_update.php | |
| parent | 5351195dd7430eb67dfa01ee76d7210f97881ebc (diff) | |
| parent | 6d913d36466a308333535963f682c07b76df9369 (diff) | |
| download | forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar.gz forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar.bz2 forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar.xz forums-72a3bcd0484460d2aeb5610762e162ca30f24263.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9307] Add config variable to installation schema.
[ticket/9307] Remove hardcoded chunk size of mass emails.
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4c588f49cd..3d8dd9d3fa 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2088,6 +2088,11 @@ function change_database_data(&$no_updates, $version) case '3.0.9-RC4': break; + // Changes from 3.0.9 to 3.0.10-RC1 + case '3.0.9': + set_config('email_max_chunk_size', '50'); + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': set_config('load_jquery_cdn', 0); |