1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00

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
This commit is contained in:
Igor Wiedler
2011-10-29 13:03:04 +02:00
3 changed files with 9 additions and 2 deletions

View File

@@ -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);