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

Merge pull request #3982 from dhensby/pulls/safe-unnesting

Browse Source 
Safe unnesting of Config and Injector
This commit is contained in:
Damian Mooyman 2015-06-26 10:08:29 +12:00
commit 8e1da86bf1
2 changed files with 212 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
control/injector/Injector.php
View File

@ -272,7 +272,16 @@ class Injector {
* @return Injector Reference to restored active Injector instance * @return Injector Reference to restored active Injector instance
*/ */
public static function unnest() { public static function unnest() {
return self::set_inst(self::$instance->nestedFrom); if (self::inst()->nestedFrom) {
self::set_inst(self::inst()->nestedFrom);
}
else {
user_error(
"Unable to unnest root Injector, please make sure you don't have mis-matched nest/unnest",
E_USER_WARNING
);
}
return self::inst();
} }
/** /**

11
core/Config.php
View File

@ -237,7 +237,16 @@ class Config {
* @return Config Reference to new active Config instance * @return Config Reference to new active Config instance
*/ */
public static function unnest() { public static function unnest() {
return self::set_instance(self::$instance->nestedFrom); if (self::inst()->nestedFrom) {
self::set_instance(self::inst()->nestedFrom);
}
else {
user_error(
"Unable to unnest root Config, please make sure you don't have mis-matched nest/unnest",
E_USER_WARNING
);
}
return self::inst();
} }
/** /**