|
@@ -40,8 +40,7 @@ |
|
|
block discarded – undo |
|
40
|
40
|
{ |
|
41
|
41
|
return self::$container->has($serviceId) ? |
|
42
|
42
|
// A public service will be found in the container. |
|
43
|
|
- self::$container->get($serviceId) : |
|
44
|
|
- // If not found in the container, then look in the service locator. |
|
|
43
|
+ self::$container->get($serviceId) : // If not found in the container, then look in the service locator. |
|
45
|
44
|
(self::$locator !== null && self::$locator->has($serviceId) ? |
|
46
|
45
|
self::$locator->get($serviceId) : null); |
|
47
|
46
|
} |
Please login to merge, or discard this patch.