tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.1' into 1.2

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

8
.tx/config
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

4
code/extensions/FileSubsites.php
View File

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