mirror of
https://github.com/e107inc/e107.git
synced 2025-04-22 05:31:58 +02:00
mod_rewrite related problems and backward incompatibilities
This commit is contained in:
parent
ce8c337b12
commit
6ecf44adb8
@ -909,7 +909,7 @@ if(!defined("THEME_LAYOUT"))
|
||||
if(is_array($cusPagePref) && count($cusPagePref)>0) // check if we match a page in layout custompages.
|
||||
{
|
||||
//e_SELF.(e_QUERY ? '?'.e_QUERY : '');
|
||||
$c_url = e_REQUEST_URL;// mod_rewrite support
|
||||
$c_url = e_REQUEST_URL.(e_QUERY ? '?'.e_QUERY : '');// mod_rewrite support
|
||||
foreach($cusPagePref as $lyout=>$cusPageArray)
|
||||
{
|
||||
if(!is_array($cusPageArray)) { continue; }
|
||||
|
@ -2237,17 +2237,17 @@ class e107
|
||||
|
||||
list($requestUrl,$requestQry) = explode("?",$_SERVER['REQUEST_URI']);
|
||||
|
||||
if($requestUrl != $_SERVER['PHP_SELF'])
|
||||
{
|
||||
$_SERVER['PHP_SELF'] = $requestUrl;
|
||||
}
|
||||
|
||||
$eplug_admin = vartrue($GLOBALS['eplug_admin'], false);
|
||||
|
||||
$page = substr(strrchr($_SERVER['PHP_SELF'], '/'), 1);
|
||||
|
||||
define('e_PAGE', $page);
|
||||
|
||||
// moved after page check - e_PAGE is important for BC
|
||||
if($requestUrl && $requestUrl != $_SERVER['PHP_SELF'])
|
||||
{
|
||||
$_SERVER['PHP_SELF'] = $requestUrl;
|
||||
}
|
||||
|
||||
$eSelf = $_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME'];
|
||||
define('e_SELF', $this->HTTP_SCHEME.'://'.$_SERVER['HTTP_HOST'].$eSelf);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user