|
@@ -274,7 +274,7 @@ discard block |
|
|
block discarded – undo |
|
274
|
274
|
$files = iterator_to_array($this->folderObject->searchFiles($searchDemand)); |
|
275
|
275
|
// @todo Currently files, which got deleted in the file system, are still found. |
|
276
|
276
|
// Therefore we have to ask their parent folder if it still contains the file. |
|
277
|
|
- $files = array_filter($files, static function (FileInterface $file): bool { |
|
|
277
|
+ $files = array_filter($files, static function(FileInterface $file): bool { |
|
278
|
278
|
try { |
|
279
|
279
|
if ($file->getParentFolder()->hasFile($file->getName())) { |
|
280
|
280
|
return true; |
|
@@ -375,7 +375,7 @@ discard block |
|
|
block discarded – undo |
|
375
|
375
|
$theData[$v] = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels._PATH_')); |
|
376
|
376
|
} else { |
|
377
|
377
|
// Normal row |
|
378
|
|
- $theData[$v] = $this->linkWrapSort($this->folderObject->getCombinedIdentifier(), $v); |
|
|
378
|
+ $theData[$v] = $this->linkWrapSort($this->folderObject->getCombinedIdentifier(), $v); |
|
379
|
379
|
} |
|
380
|
380
|
} |
|
381
|
381
|
|
|
@@ -727,7 +727,7 @@ discard block |
|
|
block discarded – undo |
|
727
|
727
|
{ |
|
728
|
728
|
// first two keys are "0" (default) and "-1" (multiple), after that comes the "other languages" |
|
729
|
729
|
$allSystemLanguages = $this->translateTools->getSystemLanguages(); |
|
730
|
|
- return array_filter($allSystemLanguages, function ($languageRecord) { |
|
|
730
|
+ return array_filter($allSystemLanguages, function($languageRecord) { |
|
731
|
731
|
if ($languageRecord['uid'] === -1 || $languageRecord['uid'] === 0 || !$this->getBackendUser()->checkLanguageAccess($languageRecord['uid'])) { |
|
732
|
732
|
return false; |
|
733
|
733
|
} |
Please login to merge, or discard this patch.