X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi.php;h=fe16326de75dec4adc5e30a6069cdb2cd449e869;hb=ac42470120235ed5d971352eec2557e58da3edb2;hp=82f738f271946a27ce244bc3d8b05954a9eb7570;hpb=836178864b970fe12e529f1f3e43047cfa185d68;p=civicrm-core.git

diff --git a/Civi.php b/Civi.php
index 82f738f271..fe16326de7 100644
--- a/Civi.php
+++ b/Civi.php
@@ -74,11 +74,7 @@ class Civi {
    * @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();
-    Civi\Core\Container::getBootServices();
-    Civi\Core\Container::singleton(TRUE);
+    Civi\Core\Container::singleton();
   }
 
   /**