1
0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-03-09 09:29:18 +01:00

avoid 500 when accessing bookmarks while being logged out, fixes #289

use correct var
This commit is contained in:
Arthur Schiwon 2016-09-08 15:51:25 +02:00
parent fad7c62111
commit b7d9150c3a
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23

View File

@ -21,6 +21,7 @@ use \OCA\Bookmarks\Controller\WebViewController;
use OCA\Bookmarks\Controller\Rest\TagsController; use OCA\Bookmarks\Controller\Rest\TagsController;
use OCA\Bookmarks\Controller\Rest\BookmarkController; use OCA\Bookmarks\Controller\Rest\BookmarkController;
use OCA\Bookmarks\Controller\Rest\PublicController; use OCA\Bookmarks\Controller\Rest\PublicController;
use OCP\IUser;
class Application extends App { class Application extends App {
@ -34,11 +35,15 @@ class Application extends App {
* @param IContainer $c The Container instance that handles the request * @param IContainer $c The Container instance that handles the request
*/ */
$container->registerService('WebViewController', function($c) { $container->registerService('WebViewController', function($c) {
/** @var IUser|null $user */
$user = $c->query('ServerContainer')->getUserSession()->getUser();
$uid = is_null($user) ? null : $user->getUID();
/** @var IContainer $c */ /** @var IContainer $c */
return new WebViewController( return new WebViewController(
$c->query('AppName'), $c->query('AppName'),
$c->query('Request'), $c->query('Request'),
$c->query('ServerContainer')->getUserSession()->getUser()->getUID(), $uid,
$c->query('ServerContainer')->getURLGenerator(), $c->query('ServerContainer')->getURLGenerator(),
$c->query('ServerContainer')->getDb() $c->query('ServerContainer')->getDb()
); );