Merge pull request #27415 from nextcloud/backport/26494/stable21

nextcloud · Jun 14, 2021 · 420d395 · 420d395
2 parents 82d1bc2 + 9f3824b
commit 420d395
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php
@@ -217,7 +217,7 @@ public static function getFiles($dir, $sortAttribute = 'name', $sortDescending =
 	 * @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
@@ -156,8 +156,8 @@ private function fetchPreview(
 		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
@@ -31,7 +31,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
@@ -422,7 +422,9 @@ public function filesize($path) {
 	 */
 	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
@@ -446,7 +448,9 @@ public function readfile($path) {
 	 */
 	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
@@ -97,7 +97,7 @@ public function setHeaderActions(array $actions) {
 			$this->headerActions[] = $action;
 		}
 		usort($this->headerActions, function (IMenuAction $a, IMenuAction $b) {
-			return $a->getPriority() > $b->getPriority();
+			return $a->getPriority() <=> $b->getPriority();
 		});
 	}