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

BUGFIX: Cant use combined_static in FileFinder any more - it falls through to Config system, which doesnt yet exist

Browse Source
This commit is contained in:
Hamish Friedlander 2011-12-22 15:23:03 +13:00
parent 1b05a337b8
commit 686b0207d5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
filesystem/FileFinder.php
View File

@ -65,7 +65,14 @@ class SS_FileFinder {
protected $options;
public function __construct() {
$this->options = Object::combined_static(get_class($this), 'default_options');
$this->options = array();
$class = get_class($this);
// We build our options array ourselves, because possibly no class or config manifest exists at this point
do {
$this->options = array_merge(Object::static_lookup($class, 'default_options'), $this->options);
}
while ($class = get_parent_class($class));
}
/**