diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:50:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:50:06 -0500 |
| commit | 3d17816812445e660ce32424115bd1efda0343d4 (patch) | |
| tree | c5636362481bf6b148534c6d3b812b18a926b59d | |
| parent | 817ef638d1ede4e3f6afb54fc0968b777f368957 (diff) | |
| parent | 6f41f964447cba0a790c5ec226235ab2f8763412 (diff) | |
| download | forums-3d17816812445e660ce32424115bd1efda0343d4.tar forums-3d17816812445e660ce32424115bd1efda0343d4.tar.gz forums-3d17816812445e660ce32424115bd1efda0343d4.tar.bz2 forums-3d17816812445e660ce32424115bd1efda0343d4.tar.xz forums-3d17816812445e660ce32424115bd1efda0343d4.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| -rw-r--r-- | phpBB/install/database_update.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d33dbc5610..b1ee9b8388 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2117,7 +2117,12 @@ function change_database_data(&$no_updates, $version) // Changes from 3.0.9 to 3.0.10-RC1 case '3.0.9': - set_config('email_max_chunk_size', '50'); + if (!isset($config['email_max_chunk_size'])) + { + set_config('email_max_chunk_size', '50'); + } + + $no_updates = false; break; // Changes from 3.1.0-dev to 3.1.0-A1 |