Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
This commit is contained in:
Oleg Pudeyev 2011-11-23 20:50:06 -05:00
commit 3d17816812

View file

@ -2117,7 +2117,12 @@ function change_database_data(&$no_updates, $version)
// Changes from 3.0.9 to 3.0.10-RC1 // Changes from 3.0.9 to 3.0.10-RC1
case '3.0.9': 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; break;
// Changes from 3.1.0-dev to 3.1.0-A1 // Changes from 3.1.0-dev to 3.1.0-A1