contao
/
aeo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

auto_item-Fehler behoben

This commit is contained in:
Carsten Goetzinger 2016-07-08 11:09:11 +02:00
parent 620c671f89
commit 5244aa2f13
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/AeoFrontendUtil.php
View File

@ -185,10 +185,10 @@ class AeoFrontendUtil extends \Frontend {
public function obfuscateEmails($strContent, $strTemplate) public function obfuscateEmails($strContent, $strTemplate)
{ {
global $objPage; global $objPage;
$objPage = $this->getPageDetails($objPage->id); $objPage2 = $this->getPageDetails($objPage->id);
$redirectPageId = $this->AeoUtil->getRedirectPageForLanguage(deserialize($this->jump_to_no_js), $objPage->rootLanguage); $redirectPageId = $this->AeoUtil->getRedirectPageForLanguage(deserialize($this->jump_to_no_js), $objPage2->rootLanguage);
if (TL_MODE == 'FE' && $this->replace_standard_obfuscation && $objPage->id != $redirectPageId) { if (TL_MODE == 'FE' && $this->replace_standard_obfuscation && $objPage2->id != $redirectPageId) {
$strContent = $this->aeoReplaceInsertTags($strContent); $strContent = $this->aeoReplaceInsertTags($strContent);
$this->import('String'); $this->import('String');
@ -221,7 +221,7 @@ class AeoFrontendUtil extends \Frontend {
} }
} }
$strContent = $this->aeo->prepareOutput($strContent, $objPage->id); $strContent = $this->aeo->prepareOutput($strContent, $objPage2->id);
} }
return $strContent; return $strContent;
@ -229,11 +229,11 @@ class AeoFrontendUtil extends \Frontend {
private function includeStaticJs() { private function includeStaticJs() {
global $objPage; global $objPage;
$objPage = $this->getPageDetails($objPage); $objPage2 = $this->getPageDetails($objPage);
$objLayout = $this->Database->prepare("SELECT * FROM tl_layout WHERE id=?") $objLayout = $this->Database->prepare("SELECT * FROM tl_layout WHERE id=?")
->limit(1) ->limit(1)
->execute($objPage->layout) ->execute($objPage2->layout)
->fetchAssoc(); ->fetchAssoc();
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/zaeo/public/js/onReadyAeo.min.js|static'; $GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/zaeo/public/js/onReadyAeo.min.js|static';

4
util/AeoRedirectUtil.php
View File

@ -176,8 +176,8 @@ class AeoRedirectUtil extends \Frontend {
$url = $arrValue['aeo_redirecturl']; $url = $arrValue['aeo_redirecturl'];
} else { } else {
$objPage = \PageModel::findPublishedByIdOrAlias($arrValue['aeo_redirecturl']); $objPage = \PageModel::findPublishedByIdOrAlias($arrValue['aeo_redirecturl']);
$objPage = $this->getPageDetails($objPage); $objPage2 = $this->getPageDetails($objPage);
$url = $this->generateFrontendUrl($objPage->row()); $url = $this->generateFrontendUrl($objPage2->row());
$url = $this->removeUrlPrefix($url); $url = $this->removeUrlPrefix($url);
if ($GLOBALS['TL_CONFIG']['addLanguageToUrl'] || if ($GLOBALS['TL_CONFIG']['addLanguageToUrl'] ||
(in_array('i18nl10n', $this->Config->getActiveModules()) && (in_array('i18nl10n', $this->Config->getActiveModules()) &&