Merge branch '1.2' into 1.3

This commit is contained in:
Robbie Averill 2017-09-08 13:54:28 +12:00
commit 4884bdde05
2 changed files with 2 additions and 10 deletions

View File

@ -1,8 +0,0 @@
[main]
host = https://www.transifex.com
[silverstripe-subsites.master]
file_filter = lang/<lang>.yml
source_file = lang/en.yml
source_lang = en
type = YML

View File

@ -9,7 +9,7 @@ class FileSubsites extends DataExtension
// If this is set to true, all folders created will be default be
// considered 'global', unless set otherwise
public static $default_root_folders_global = false;
private static $has_one=array(
'Subsite' => 'Subsite',
);
@ -130,7 +130,7 @@ class FileSubsites extends DataExtension
return $access;
}
}
/**
* Return a piece of text to keep DataObject cache keys appropriately specific
*/