add opposite url to isSsl()-Url to AutoLinker list
This commit is contained in:
bovenliggende
0166ff5ff5
commit
5b992ba973
@ -147,21 +147,33 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
|
||||
*/
|
||||
protected function _d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, $aUrls)
|
||||
{
|
||||
$sUrl = str_replace('http://', '', $aLanguageUrls[$oVal->id]);
|
||||
$sSslUrl = str_replace('https://', '', $aSslLanguageUrls[$oVal->id]);
|
||||
$blIsSsl = oxRegistry::getConfig()->isSsl();
|
||||
|
||||
if ($aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
|
||||
if ($this->_d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)) {
|
||||
$sUrl = str_replace('http://', '', $aLanguageUrls[$oVal->id]);
|
||||
$aUrls[] = "'" . $sUrl . "'";
|
||||
}
|
||||
if ($aSslLanguageUrls[$oVal->id] != $aSslLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
|
||||
$aUrls[] = "'" . $sSslUrl . "'";
|
||||
|
||||
return $aUrls;
|
||||
if ($this->_d3CheckLanguageUrlsToList($aSslLanguageUrls, $oVal, !$blIsSsl)) {
|
||||
$sSslUrl = str_replace('https://', '', $aSslLanguageUrls[$oVal->id]);
|
||||
$aUrls[] = "'" . $sSslUrl . "'";
|
||||
}
|
||||
|
||||
return $aUrls;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $aLanguageUrls
|
||||
* @param $oVal
|
||||
* @param $blIsSsl
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
protected function _d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)
|
||||
{
|
||||
return $blIsSsl || $aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
|
@ -1,6 +1,7 @@
|
||||
=> 3.2.0.0
|
||||
- Tracking für gekaufte Artikel enthält Daten zur Kategorie / Seite, aus der die Artikel zuerst in den Warenkorb gelegt wurden
|
||||
- Bugfix: Artikeltitel werden escaped, sofern Quotes enthalten sind
|
||||
- AutoLinker-URL enthält auch abweichende SSL-URLs
|
||||
|
||||
=> 3.1.0.2
|
||||
- Bugfix: deaktiviertes Modul kann benötigtes Objekt nicht laden
|
||||
|
Laden…
Verwijs in nieuw issue
Block a user