ConLite
/
cl-mod-rewrite
1
0
Fork 0
Code Issues Pull-Requests Releases 2 Aktivität

fixed warning and deprecated errors

Dieser Commit ist enthalten in:
o.pinke 2022-04-03 15:18:21 +02:00
Ursprung 06cc337092
Commit 91b0fd8c15
2 geänderte Dateien mit 4 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
classes/class.modrewriteurlstack.php
Datei anzeigen

@ -149,8 +149,8 @@ class ModRewriteUrlStack {
$this->_chunkSetPrettyUrlParts($sStackId); $this->_chunkSetPrettyUrlParts($sStackId);
} }
$aPretty = array( $aPretty = array(
'urlpath' => $this->_aStack[$sStackId]['urlpath'], 'urlpath' => (empty($this->_aStack[$sStackId]['urlpath']))?'':$this->_aStack[$sStackId]['urlpath'],
'urlname' => $this->_aStack[$sStackId]['urlname'] 'urlname' => (empty($this->_aStack[$sStackId]['urlname']))?'':$this->_aStack[$sStackId]['urlname']
); );
return $aPretty; return $aPretty;
} }
@ -168,7 +168,7 @@ class ModRewriteUrlStack {
$aUrl['query'] = str_replace('&', '&', $aUrl['query']); $aUrl['query'] = str_replace('&', '&', $aUrl['query']);
parse_str($aUrl['query'], $aUrl['params']); parse_str($aUrl['query'], $aUrl['params']);
} }
if (!isset($aUrl['params']) && !is_array($aUrl['params'])) { if (empty($aUrl['params']) || !is_array($aUrl['params'])) {
$aUrl['params'] = array(); $aUrl['params'] = array();
} }
return $aUrl; return $aUrl;

3
includes/functions.mod_rewrite.php
Datei anzeigen

@ -615,8 +615,7 @@ function mr_loadConfiguration($clientId, $forceReload = false) {
} }
function mr_getConfigurationFilePath($clientId) { function mr_getConfigurationFilePath($clientId) {
$clientConfig = cRegistry::getClientConfig((int) $clientId); $fePath = cRegistry::getFrontendPath();
$fePath = $clientConfig['path']['frontend'];
return $fePath . 'data/config/' . CL_ENVIRONMENT . '/config.mod_rewrite.php'; return $fePath . 'data/config/' . CL_ENVIRONMENT . '/config.mod_rewrite.php';
} }