upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-25 08:08:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

fix: Deprecate OC_App::getCurrentApp and remove its only use

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2026-03-08 17:00:44 +01:00
parent 9cd3177bb4
commit 521bb9432e
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/TemplateLayout.php
View file

@ -58,6 +58,7 @@ class TemplateLayout {
private INavigationManager $navigationManager,
private ITemplateManager $templateManager,
private ServerVersion $serverVersion,
private IRequest $request,
) {
}
@ -72,7 +73,8 @@ class TemplateLayout {
switch ($renderAs) {
case TemplateResponse::RENDER_AS_USER:
$page = $this->templateManager->getTemplate('core', 'layout.user');
if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
$pathInfo = $this->request->getPathInfo();
if ($pathInfo !== false && str_starts_with($pathInfo, '/settings/')) {
$page->assign('bodyid', 'body-settings');
} else {
$page->assign('bodyid', 'body-user');
@ -254,10 +256,8 @@ class TemplateLayout {
$page->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
}
$request = Server::get(IRequest::class);
try {
$pathInfo = $request->getPathInfo();
$pathInfo = $this->request->getPathInfo();
} catch (\Exception $e) {
$pathInfo = '';
}
@ -298,7 +298,7 @@ class TemplateLayout {
}
}
if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
if ($this->request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
// Prevent auto zoom with iOS but still allow user zoom
// On chrome (and others) this does not work (will also disable user zoom)
$page->assign('viewport_maximum_scale', '1.0');

1
lib/private/legacy/OC_App.php
View file

@ -261,6 +261,7 @@ class OC_App {
/**
* get the id of loaded app
* @deprecated 34.0.0 Don’t do that
*/
public static function getCurrentApp(): string {
if (\OC::$CLI) {