Merge branch 'dev-extbase-fluid-compatibility' of https://github.com/chrizzor/kitodo-presentation into dev-extbase-fluid-compatibility
This commit is contained in:
commit
ba95d56001
|
@ -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 = '';
|
||||
|
|
|
@ -483,7 +483,7 @@ class Solr implements LoggerAwareInterface
|
|||
$resultSet[] = $doc;
|
||||
}
|
||||
// Save value in cache.
|
||||
if ($resultSet) {
|
||||
if (!empty($resultSet)) {
|
||||
$cache->set($cacheIdentifier, $resultSet);
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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())) {
|
||||
|
|
Loading…
Reference in New Issue