diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/AppFramework/Utility/SimpleContainer.php | 3 | ||||
| -rw-r--r-- | lib/private/Log/File.php | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 8d5bceb0b87..889f17cbc6a 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -68,6 +68,9 @@ class SimpleContainer extends Container implements IContainer { // Service not found, use the default value when available if ($parameter->isDefaultValueAvailable()) { $parameters[] = $parameter->getDefaultValue(); + } else if ($parameterClass !== null) { + $resolveName = $parameter->getName(); + $parameters[] = $this->query($resolveName); } else { throw $e; } diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index a406dd83952..904aa1d93f1 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -96,11 +96,12 @@ class File { $time = $time->format($format); $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--'; $method = is_string($request->getMethod()) ? $request->getMethod() : '--'; - if(\OC::$server->getConfig()->getSystemValue('installed', false)) { + if($config->getValue('installed', false)) { $user = (\OC_User::getUser()) ? \OC_User::getUser() : '--'; } else { $user = '--'; } + $version = $config->getValue('version', ''); $entry = compact( 'reqId', 'remoteAddr', @@ -110,7 +111,8 @@ class File { 'time', 'method', 'url', - 'user' + 'user', + 'version' ); $entry = json_encode($entry); $handle = @fopen(self::$logFile, 'a'); |