Skip to content
Snippets Groups Projects
Commit ee14cab4 authored by Matthias Adrowski's avatar Matthias Adrowski
Browse files

[TASK] Update image handling to latest sg_seo

parent f59146dc
No related branches found
No related tags found
1 merge request!38Feature upgrade to typo3 11
Hide whitespace changes
Inline Side-by-side
Classes/Controller/ListByCategoryController.php
+ 12
− 6
View file @ ee14cab4
...@@ -177,12 +177,18 @@ class ListByCategoryController extends AbstractController { ...@@ -177,12 +177,18 @@ class ListByCategoryController extends AbstractController {
if (!$headerSet) { if (!$headerSet) {
if (!version_compare(ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', '>=')) { if (!version_compare(ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', '>=')) {
if ($data['image']) { if (isset($newsMetaData['imageObject'])) {
HeaderMetaDataService::addOgImageToHeader($data['image']); HeaderMetaDataService::addOgImageObjectToHeader(
$headerSet = TRUE; $newsMetaData['imageObject']
} elseif ($data['teaserImage']) { ? $newsMetaData['imageObject']->getOriginalResource()
HeaderMetaDataService::addOgImageToHeader($data['teaserImage']); : NULL
$headerSet = TRUE; );
} elseif (isset($newsMetaData['teaserImageObject'])) {
HeaderMetaDataService::addOgImageObjectToHeader(
$newsMetaData['teaserImageObject']
? $newsMetaData['teaserImageObject']->getOriginalResource()
: NULL
);
} }
} }
} }
......
Classes/Controller/OverviewController.php
+ 12
− 4
View file @ ee14cab4
...@@ -183,10 +183,18 @@ class OverviewController extends AbstractController { ...@@ -183,10 +183,18 @@ class OverviewController extends AbstractController {
} }
if (!version_compare(ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', '>=')) { if (!version_compare(ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', '>=')) {
if ($highlightedNewsMetaData['image']) { if (isset($highlightedNewsMetaData['imageObject'])) {
HeaderMetaDataService::addOgImageToHeader($highlightedNewsMetaData['image']); HeaderMetaDataService::addOgImageObjectToHeader(
} elseif ($highlightedNewsMetaData['teaserImage']) { $highlightedNewsMetaData['imageObject']
HeaderMetaDataService::addOgImageToHeader($highlightedNewsMetaData['teaserImage']); ? $highlightedNewsMetaData['imageObject']->getOriginalResource()
: NULL
);
} elseif (isset($highlightedNewsMetaData['teaserImageObject'])) {
HeaderMetaDataService::addOgImageObjectToHeader(
$highlightedNewsMetaData['teaserImageObject']
? $highlightedNewsMetaData['teaserImageObject']->getOriginalResource()
: NULL
);
} }
} }
} }
......
Classes/Controller/SingleViewController.php
+ 18
− 6
View file @ ee14cab4
...@@ -70,7 +70,9 @@ class SingleViewController extends AbstractController { ...@@ -70,7 +70,9 @@ class SingleViewController extends AbstractController {
$currentId = (int) $GLOBALS['TSFE']->id; $currentId = (int) $GLOBALS['TSFE']->id;
$news = $this->newsRepository->findByUid($currentId); $news = $this->newsRepository->findByUid($currentId);
if (!$news) { if (!$news) {
if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { if (version_compare(
\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<'
)) {
return NULL; return NULL;
} else { } else {
return $this->htmlResponse(); return $this->htmlResponse();
...@@ -80,7 +82,9 @@ class SingleViewController extends AbstractController { ...@@ -80,7 +82,9 @@ class SingleViewController extends AbstractController {
/** @var Category $newsCategory */ /** @var Category $newsCategory */
$newsCategory = $this->categoryRepository->findByUid($news->getPid()); $newsCategory = $this->categoryRepository->findByUid($news->getPid());
if (!$newsCategory) { if (!$newsCategory) {
if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { if (version_compare(
\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<'
)) {
return NULL; return NULL;
} else { } else {
return $this->htmlResponse(); return $this->htmlResponse();
...@@ -89,10 +93,18 @@ class SingleViewController extends AbstractController { ...@@ -89,10 +93,18 @@ class SingleViewController extends AbstractController {
$newsMetaData = $this->getMetaDataForNews($news, $newsCategory); $newsMetaData = $this->getMetaDataForNews($news, $newsCategory);
if (!version_compare(ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', '>=')) { if (!version_compare(ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', '>=')) {
if ($newsMetaData['image']) { if (isset($newsMetaData['imageObject'])) {
HeaderMetaDataService::addOgImageObjectToHeader(isset($newsMetaData['imageObject']) ? $newsMetaData['imageObject']->getOriginalResource(): null); HeaderMetaDataService::addOgImageObjectToHeader(
} elseif ($newsMetaData['teaserImage']) { $newsMetaData['imageObject']
HeaderMetaDataService::addOgImageToHeader($newsMetaData['teaserImage']); ? $newsMetaData['imageObject']->getOriginalResource()
: NULL
);
} elseif (isset($newsMetaData['teaserImageObject'])) {
HeaderMetaDataService::addOgImageObjectToHeader(
$newsMetaData['teaserImageObject']
? $newsMetaData['teaserImageObject']->getOriginalResource()
: NULL
);
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment