tonyair/silverstripe-translatable
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-translatable synced 2024-10-22 09:05:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126 from jthomerson/pulls/fix_populate_site_config_defaults

Browse Source 
FIX: don't re-enable the locale filter if it wasn't enabled before
This commit is contained in:
Ingo Schommer 2013-08-03 03:16:17 -07:00
commit f951e43612
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/model/Translatable.php
View File

@ -1259,12 +1259,15 @@ class Translatable extends DataExtension implements PermissionProvider {
if(DB::getConn()->isSchemaUpdating()) return;
// Find the best base translation for SiteConfig
$enabled = Translatable::locale_filter_enabled();
Translatable::disable_locale_filter();
$existingConfig = SiteConfig::get()->filter(array(
'Locale' => Translatable::default_locale()
))->first();
if(!$existingConfig) $existingConfig = SiteConfig::get()->first();
Translatable::enable_locale_filter();
if ($enabled) {
Translatable::enable_locale_filter();
}
// Stage this SiteConfig and copy into the current object
if(