diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 1 | ||||
| -rw-r--r-- | lib/private/Installer.php | 4 | ||||
| -rw-r--r-- | lib/private/OCS/DiscoveryService.php | 3 | ||||
| -rw-r--r-- | lib/private/Server.php | 16 | ||||
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 4 |
5 files changed, 21 insertions, 7 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 072dd9f172f..77ecb02165b 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -406,6 +406,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { if ($this->method === 'PUT' && $this->getHeader('Content-Length') !== 0 && $this->getHeader('Content-Length') !== null + && $this->getHeader('Content-Length') !== '' && strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') === false && strpos($this->getHeader('Content-Type'), 'application/json') === false ) { diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 48bd57f4c10..eb1f8a456bf 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -396,10 +396,10 @@ class Installer { } if ($this->apps === null) { - $apps = $this->appFetcher->get(); + $this->apps = $this->appFetcher->get(); } - foreach($apps as $app) { + foreach($this->apps as $app) { if($app['id'] === $appId) { $currentVersion = OC_App::getAppVersion($appId); $newestVersion = $app['releases'][0]['version']; diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php index 35230b4cfd3..e547747da25 100644 --- a/lib/private/OCS/DiscoveryService.php +++ b/lib/private/OCS/DiscoveryService.php @@ -81,11 +81,10 @@ class DiscoveryService implements IDiscoveryService { } } catch (\Exception $e) { // if we couldn't discover the service or any end-points we return a empty array - return []; } // Write into cache - $this->cache->set($remote . '#' . $service, json_encode($discoveredServices)); + $this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60*60*24); return $discoveredServices; } diff --git a/lib/private/Server.php b/lib/private/Server.php index 8a5fb0fa96c..6898e93e3bb 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -897,7 +897,21 @@ class Server extends ServerContainer implements IServerContainer { $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory'); /** @var \OCP\Comments\ICommentsManagerFactory $factory */ $factory = new $factoryClass($this); - return $factory->getManager(); + $manager = $factory->getManager(); + + $manager->registerDisplayNameResolver('user', function($id) use ($c) { + $manager = $c->getUserManager(); + $user = $manager->get($id); + if(is_null($user)) { + $l = $c->getL10N('core'); + $displayName = $l->t('Unknown user'); + } else { + $displayName = $user->getDisplayName(); + } + return $displayName; + }); + + return $manager; }); $this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class); diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index cd69b8b63c3..8f6cb85a120 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -285,7 +285,7 @@ class SCSSCacher { $re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x'; // OC\Route\Router:75 if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) { - $subst = 'url(\'../../'.$webDir.'/$1\')'; + $subst = 'url(\'../../'.$webDir.'/$1\')'; } else { $subst = 'url(\'../../../'.$webDir.'/$1\')'; } @@ -313,6 +313,6 @@ class SCSSCacher { */ private function prependBaseurlPrefix($cssFile) { $frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'); - return md5($this->urlGenerator->getBaseUrl() . $frontendController) . '-' . $cssFile; + return substr(md5($this->urlGenerator->getBaseUrl() . $frontendController), 0, 8) . '-' . $cssFile; } } |