diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:48:39 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:48:39 -0500 |
| commit | 3eda9cfc07b1558bb20db1892ed0c75e9335f1ab (patch) | |
| tree | 9966d7d6bb05bab5312b483af9935089741983df /phpBB | |
| parent | 74bca1d97b8bc8f4e5e571bff4edbf022820e54e (diff) | |
| parent | 43818289fe91906bb5d095ea944f142fef8488b4 (diff) | |
| download | forums-3eda9cfc07b1558bb20db1892ed0c75e9335f1ab.tar forums-3eda9cfc07b1558bb20db1892ed0c75e9335f1ab.tar.gz forums-3eda9cfc07b1558bb20db1892ed0c75e9335f1ab.tar.bz2 forums-3eda9cfc07b1558bb20db1892ed0c75e9335f1ab.tar.xz forums-3eda9cfc07b1558bb20db1892ed0c75e9335f1ab.zip | |
Merge remote-tracking branch 'bantu/ticket/10488' into prep-release-3.0.10
* bantu/ticket/10488:
[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 9ca011c8aa..57e2ef73b8 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; } } |