Merge branch '1.1' into 1.2

This commit is contained in:
Robbie Averill 2017-09-08 13:54:05 +12:00
commit 4328c20b45
3 changed files with 3 additions and 11 deletions

View File

@ -4,7 +4,7 @@ language: php
sudo: false
sudo: false
dist: precise
php:
- 5.4

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
*/