diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-07-24 11:36:20 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-08-01 08:20:17 +0200 |
| commit | ede15f0988c02cf65f9d1a763d9bb2ea0edde2e9 (patch) | |
| tree | 7e2295dd8598ba894b4eaaf7d7d47ff8b4946d7e /lib/private/AppFramework | |
| parent | fd465d4e492bf19812f2c62f06766b3d70f8a270 (diff) | |
| download | nextcloud-server-ede15f0988c02cf65f9d1a763d9bb2ea0edde2e9.tar.gz nextcloud-server-ede15f0988c02cf65f9d1a763d9bb2ea0edde2e9.zip | |
Fix L10N::t
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib/private/AppFramework')
| -rw-r--r-- | lib/private/AppFramework/DependencyInjection/DIContainer.php | 2 | ||||
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index b233f3ca9b6..d0c69c3bf32 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -75,7 +75,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { * Put your class dependencies in here * @param string $appName the name of the app * @param array $urlParams - * @param ServerContainer $server + * @param ServerContainer|null $server */ public function __construct($appName, $urlParams = array(), ServerContainer $server = null){ parent::__construct(); diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 09e18f74177..956744e5d5e 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -721,7 +721,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { // strip off the script name's dir and file name // FIXME: Sabre does not really belong here - list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($scriptName); + list($path, $name) = \Sabre\Uri\split($scriptName); if (!empty($path)) { if($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) { $pathInfo = substr($pathInfo, strlen($path)); |