release/3.2.2 to develop conflicts
This commit is contained in:
@@ -1381,13 +1381,13 @@ class WebEntryEvent
|
||||
strpos($domain, 'https://') === 0;
|
||||
$url = ($hasProtocol ? '' : $http) .
|
||||
$domain .
|
||||
"/sys" . SYS_SYS . "/" .
|
||||
"/sys" . config("system.workspace") . "/" .
|
||||
$weLinkLanguage . "/" .
|
||||
$weLinkSkin . "/" . $prj_uid;
|
||||
|
||||
return $url . "/" . $weData;
|
||||
} else {
|
||||
$url = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $prj_uid;
|
||||
$url = $http . $_SERVER["HTTP_HOST"] . "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $prj_uid;
|
||||
|
||||
return $url . "/" . $weData;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user