diff options
| -rw-r--r-- | apps/files/lib/Helper.php | 2 | ||||
| -rw-r--r-- | core/Controller/PreviewController.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/Config/CachedMountFileInfo.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/View.php | 8 | ||||
| -rw-r--r-- | lib/public/AppFramework/Http/Template/PublicTemplateResponse.php | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index 67e2fbe8321..18fea3aa2a1 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -216,7 +216,7 @@ class Helper { * @param ITagManager $tagManager * @return array file list populated with tags */ - public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) { + public static function populateTags(array $fileList, $fileIdentifier, ITagManager $tagManager) { $ids = []; foreach ($fileList as $fileData) { $ids[] = $fileData[$fileIdentifier]; diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php index e1bfa01b238..1224ea39877 100644 --- a/core/Controller/PreviewController.php +++ b/core/Controller/PreviewController.php @@ -155,8 +155,8 @@ class PreviewController extends Controller { Node $node, int $x, int $y, - bool $a = false, - bool $forceIcon = true, + bool $a, + bool $forceIcon, string $mode) : Http\Response { if (!($node instanceof File) || (!$forceIcon && !$this->preview->isAvailable($node))) { return new DataResponse([], Http::STATUS_NOT_FOUND); diff --git a/lib/private/Files/Config/CachedMountFileInfo.php b/lib/private/Files/Config/CachedMountFileInfo.php index a179b9aef8b..7fdc26f7d53 100644 --- a/lib/private/Files/Config/CachedMountFileInfo.php +++ b/lib/private/Files/Config/CachedMountFileInfo.php @@ -30,7 +30,7 @@ class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInf /** @var string */ private $internalPath; - public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '', $internalPath) { + public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath, $internalPath) { parent::__construct($user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath); $this->internalPath = $internalPath; } diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index e11b9be9fed..113290e2686 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -421,7 +421,9 @@ class View { */ public function readfile($path) { $this->assertPathLength($path); - @ob_end_clean(); + if (ob_get_level()) { + ob_end_clean(); + } $handle = $this->fopen($path, 'rb'); if ($handle) { $chunkSize = 524288; // 512 kB chunks @@ -445,7 +447,9 @@ class View { */ public function readfilePart($path, $from, $to) { $this->assertPathLength($path); - @ob_end_clean(); + if (ob_get_level()) { + ob_end_clean(); + } $handle = $this->fopen($path, 'rb'); if ($handle) { $chunkSize = 524288; // 512 kB chunks diff --git a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php index 70bec65b096..1196c90935d 100644 --- a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php +++ b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php @@ -96,7 +96,7 @@ class PublicTemplateResponse extends TemplateResponse { $this->headerActions[] = $action; } usort($this->headerActions, function (IMenuAction $a, IMenuAction $b) { - return $a->getPriority() > $b->getPriority(); + return $a->getPriority() <=> $b->getPriority(); }); } |