Merge branch 'dev-extbase-fluid' into dev-extbase-fluid-compatibility

This commit is contained in:
Alexander Bigga 2021-11-23 23:03:54 +01:00 committed by GitHub
commit 06c1122ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 4 deletions

View File

@ -1626,6 +1626,7 @@ abstract class Document
*/
protected function __construct($uid, $pid, $preloadedDocument)
{
$this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger();
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
->getQueryBuilderForTable('tx_dlf_documents');
$location = '';

View File

@ -483,7 +483,7 @@ class Solr implements LoggerAwareInterface
$resultSet[] = $doc;
}
// Save value in cache.
if ($resultSet) {
if (!empty($resultSet)) {
$cache->set($cacheIdentifier, $resultSet);
}
} else {

View File

@ -335,7 +335,7 @@ class BasketController extends AbstractController
$title = $document->getTitle($id, true);
if (empty($title)) {
$title = LocalizationUtility::translate('basket.noTitle', 'dlf');
$title = LocalizationUtility::translate('basket.noTitle', 'dlf') ? : '';
}
// Set page and cutout information

View File

@ -286,6 +286,7 @@ class CalendarController extends AbstractController
) {
$dayLinks = '';
$dayLinksText = [];
$dayLinkDiv = [];
$currentMonth = date('n', $currentDayTime);
if (is_array($calendarIssuesByMonth[$currentMonth])) {
foreach ($calendarIssuesByMonth[$currentMonth] as $id => $day) {

View File

@ -158,7 +158,7 @@ class CollectionController extends AbstractController
*
* @access protected
*
* @param \Kitodo\Dlf\Domain\Model\Collection The collection object
* @param \Kitodo\Dlf\Domain\Model\Collection $collection: The collection object
*
* @return void
*/

View File

@ -53,6 +53,7 @@ class FeedsController extends AbstractController
$requestData = $this->request->getArguments();
// get library information
/** @var \Kitodo\Dlf\Domain\Model\Library|null $library */
$library = $this->libraryRepository->findByUid($this->settings['library']);
$feedMeta = [];
@ -90,7 +91,7 @@ class FeedsController extends AbstractController
}
// Set default title if empty.
if (empty($title)) {
$title = LocalizationUtility::translate('noTitle', 'dlf');
$title = LocalizationUtility::translate('noTitle', 'dlf') ? : '';
}
// Append volume information.
if (!empty($document->getVolume())) {