Increase develop-branch to PHP8 #47

Zusammengeführt
Oldperl hat 110 Commits von dev_php82 nach develop 2023-10-16 16:09:02 +00:00 zusammengeführt
Nur Änderungen aus Commit 33dcc58748 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -237,7 +237,7 @@ function conGenerateCode($idcat, $idart, $lang, $client, $layout = false) {
$a_container = explode("&", $tmp_returnstring); $a_container = explode("&", $tmp_returnstring);
foreach ($a_container as $key => $value) { foreach ($a_container as $key => $value) {
if (is_numeric($a_d[$value])) { if (is_numeric($a_d[$value])) {
$thisModule = '<?php $cCurrentModule = ' . ((int) $a_d[$value]) . '; ?>'; $thisModule = '<?php $cCurrentModule = ' . ((int) $a_d[$value]) . '; ?>';
$thisContainer = '<?php $cCurrentContainer = ' . ((int) $value) . '; ?>'; $thisContainer = '<?php $cCurrentContainer = ' . ((int) $value) . '; ?>';
@ -573,21 +573,18 @@ function conGetAvailableMetaTagTypes() {
* @return string tag value or empty string * @return string tag value or empty string
*/ */
function conGetMetaValue($idartlang, $idmetatype) { function conGetMetaValue($idartlang, $idmetatype) {
$sRet = "";
if (!empty($idartlang)) {
$oMetaTags = new cApiMetaTagCollection();
$oMetaTags->setWhere('idartlang', Contenido_Security::toInteger($idartlang));
$oMetaTags->setWhere('idmetatype', Contenido_Security::toInteger($idmetatype));
$oMetaTags->query();
if ($idartlang == 0) if ($oMetaTags->count() > 0) {
return; $sRet = $oMetaTags->next()->get('metavalue');
}
$oMetaTags = new cApiMetaTagCollection(); unset($oMetaTags); // save mem
$oMetaTags->setWhere('idartlang', Contenido_Security::toInteger($idartlang));
$oMetaTags->setWhere('idmetatype', Contenido_Security::toInteger($idmetatype));
$oMetaTags->query();
if ($oMetaTags->count() > 0) {
$sRet = $oMetaTags->next()->get('metavalue');
} else {
$sRet = "";
} }
unset($oMetaTags); // save mem
return $sRet; return $sRet;
} }