projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3 from eileenmcnaughton/karing
[civicrm-core.git]
/
Civi.php
diff --git
a/Civi.php
b/Civi.php
index 82f738f271946a27ce244bc3d8b05954a9eb7570..fe16326de75dec4adc5e30a6069cdb2cd449e869 100644
(file)
--- a/
Civi.php
+++ b/
Civi.php
@@
-74,11
+74,7
@@
class Civi {
* @return \Civi\Core\Paths
*/
public static function paths() {
* @return \Civi\Core\Paths
*/
public static function paths() {
- // Paths must be available before container can boot.
- if (!isset(Civi::$statics[__CLASS__]['paths'])) {
- Civi::$statics[__CLASS__]['paths'] = new \Civi\Core\Paths();
- }
- return Civi::$statics[__CLASS__]['paths'];
+ return \Civi\Core\Container::getBootService('paths');
}
/**
}
/**
@@
-98,8
+94,7
@@
class Civi {
*/
public static function reset() {
self::$statics = array();
*/
public static function reset() {
self::$statics = array();
- Civi\Core\Container::getBootServices();
- Civi\Core\Container::singleton(TRUE);
+ Civi\Core\Container::singleton();
}
/**
}
/**