mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17965 from nextcloud/fix/noid/strict-controller-userid 

Fixes a 500 without userid
This commit is contained in:
blizzz 2019-11-18 12:10:17 +01:00 committed by GitHub
parent 6db146f1d8 0a1937208f
commit bb77c1447b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/lib/Controller/HelpController.php
View File

@ -50,7 +50,7 @@ class HelpController extends Controller {
IRequest $request, IRequest $request,
INavigationManager $navigationManager, INavigationManager $navigationManager,
IURLGenerator $urlGenerator, IURLGenerator $urlGenerator,
string $userId, ?string $userId,
IGroupManager $groupManager IGroupManager $groupManager
) { ) {
parent::__construct($appName, $request); parent::__construct($appName, $request);

5
lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
View File

@ -37,13 +37,8 @@ use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException; use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException;
use OC\AppFramework\Middleware\Security\Exceptions\StrictCookieMissingException; use OC\AppFramework\Middleware\Security\Exceptions\StrictCookieMissingException;
use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Utility\ControllerMethodReflector;
use OC\Security\CSP\ContentSecurityPolicyManager;
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OC\Security\CSRF\CsrfTokenManager;
use OCP\App\AppPathNotFoundException; use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Middleware; use OCP\AppFramework\Middleware;