Permalink
Browse files

BUGFIX: Cant use combined_static in FileFinder any more - it falls th…

…rough to Config system, which doesnt yet exist
  • Loading branch information...
Hamish Friedlander
Hamish Friedlander committed Dec 22, 2011
1 parent 1b05a33 commit 686b0207d50eb4fd8f02ccab59d4819711a6db03
Showing with 8 additions and 1 deletion.
  1. +8 −1 filesystem/FileFinder.php
@@ -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));
}
/**

0 comments on commit 686b020

Please sign in to comment.