diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:50:01 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:50:01 -0500 |
| commit | 6f41f964447cba0a790c5ec226235ab2f8763412 (patch) | |
| tree | f3e4d52821764791f2df6866184904fa911fb7af /phpBB | |
| parent | d13ce7f5605ec99352b8314aabc51f2ecdd4456c (diff) | |
| parent | 3eda9cfc07b1558bb20db1892ed0c75e9335f1ab (diff) | |
| download | forums-6f41f964447cba0a790c5ec226235ab2f8763412.tar forums-6f41f964447cba0a790c5ec226235ab2f8763412.tar.gz forums-6f41f964447cba0a790c5ec226235ab2f8763412.tar.bz2 forums-6f41f964447cba0a790c5ec226235ab2f8763412.tar.xz forums-6f41f964447cba0a790c5ec226235ab2f8763412.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
Diffstat (limited to 'phpBB')
| -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 1d96f40fdf..29d9c86fa9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1999,7 +1999,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; } } |