SettingsBag - Fix bug upgrading `4.1.0-setupsh.sql.bz2` to 4.7.beta.

[civicrm-core.git] / Civi / Core / Resolver.php

diff --git a/Civi/Core/Resolver.php b/Civi/Core/Resolver.php
index d76b5121645c1736eb183628942ac1b3716dc59d..70654bac29a43cbf64d6a114cdadf4150a074eb5 100644 (file)
--- a/Civi/Core/Resolver.php
+++ b/Civi/Core/Resolver.php
@@ -72,11 +72,11 @@ class Resolver {
       switch ($url['scheme']) {
         case 'obj':
           // Object: Lookup in container.
-          return Container::singleton()->get($url['host']);
+          return \Civi::service($url['host']);
 
         case 'call':
           // Callback: Object/method in container.
-          $obj = Container::singleton()->get($url['host']);
+          $obj = \Civi::service($url['host']);
           return array($obj, ltrim($url['path'], '/'));
 
         case 'api3':
@@ -267,6 +267,8 @@ class ResolverGlobalCallback {
   /**
    * Invoke function.
    *
+   * @param mixed $arg1
+   *
    * @return mixed
    */
   public function __invoke($arg1 = NULL) {