mirror of
https://github.com/e107inc/e107.git
synced 2025-08-04 05:37:32 +02:00
#4784 Fixes LiteSpeed compatibility with mod-rewrite flag. Corrected 'cache_clear' event trigger.
This commit is contained in:
@@ -284,6 +284,7 @@ class ecache {
|
|||||||
|
|
||||||
$file = ($CacheTag) ? preg_replace("#\W#", "_", $CacheTag)."*.cache.php" : "*.cache.php";
|
$file = ($CacheTag) ? preg_replace("#\W#", "_", $CacheTag)."*.cache.php" : "*.cache.php";
|
||||||
e107::getEvent()->triggerAdminEvent('cache_clear', "cachetag=$CacheTag&file=$file&syscache=$syscache");
|
e107::getEvent()->triggerAdminEvent('cache_clear', "cachetag=$CacheTag&file=$file&syscache=$syscache");
|
||||||
|
e107::getEvent()->trigger('cache_clear', ['tag'=>$CacheTag, 'file'=>$file, 'system'=>$syscache]);
|
||||||
$ret = self::delete(e_CACHE_CONTENT, $file, $syscache);
|
$ret = self::delete(e_CACHE_CONTENT, $file, $syscache);
|
||||||
|
|
||||||
if($CacheTag && $related) //TODO - too dirty - add it to the $file pattern above
|
if($CacheTag && $related) //TODO - too dirty - add it to the $file pattern above
|
||||||
|
@@ -4876,17 +4876,23 @@ class e107
|
|||||||
|
|
||||||
if(!defined('e_MOD_REWRITE')) // Allow e107_config.php to override.
|
if(!defined('e_MOD_REWRITE')) // Allow e107_config.php to override.
|
||||||
{
|
{
|
||||||
define('e_MOD_REWRITE', ((getenv('HTTP_MOD_REWRITE') === 'On' || getenv('REDIRECT_HTTP_MOD_REWRITE') === 'On')));
|
$HTTP_MOD_REWRITE = isset($_SERVER['HTTP_MOD_REWRITE']) ? $_SERVER['HTTP_MOD_REWRITE'] : getenv('HTTP_MOD_REWRITE');
|
||||||
|
$REDIRECT_HTTP_MOD_REWRITE = isset($_SERVER['REDIRECT_HTTP_MOD_REWRITE']) ? $_SERVER['REDIRECT_HTTP_MOD_REWRITE'] : getenv('REDIRECT_HTTP_MOD_REWRITE');
|
||||||
|
define('e_MOD_REWRITE', (($HTTP_MOD_REWRITE === 'On' || $REDIRECT_HTTP_MOD_REWRITE === 'On')));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!defined('e_MOD_REWRITE_MEDIA')) // Allow e107_config.php to override.
|
if(!defined('e_MOD_REWRITE_MEDIA')) // Allow e107_config.php to override.
|
||||||
{
|
{
|
||||||
define('e_MOD_REWRITE_MEDIA', ((getenv('HTTP_MOD_REWRITE_MEDIA') === 'On' || getenv('REDIRECT_HTTP_MOD_REWRITE_MEDIA') === 'On')));
|
$HTTP_MOD_REWRITE_MEDIA = isset($_SERVER['HTTP_MOD_REWRITE_MEDIA']) ? $_SERVER['HTTP_MOD_REWRITE_MEDIA'] : getenv('HTTP_MOD_REWRITE_MEDIA');
|
||||||
|
$REDIRECT_HTTP_MOD_REWRITE_MEDIA = isset($_SERVER['REDIRECT_HTTP_MOD_REWRITE_MEDIA']) ? $_SERVER['REDIRECT_HTTP_MOD_REWRITE_MEDIA'] : getenv('REDIRECT_HTTP_MOD_REWRITE_MEDIA');
|
||||||
|
define('e_MOD_REWRITE_MEDIA', (($HTTP_MOD_REWRITE_MEDIA === 'On' || $REDIRECT_HTTP_MOD_REWRITE_MEDIA === 'On')));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!defined('e_MOD_REWRITE_STATIC')) // Allow e107_config.php to override.
|
if(!defined('e_MOD_REWRITE_STATIC')) // Allow e107_config.php to override.
|
||||||
{
|
{
|
||||||
define('e_MOD_REWRITE_STATIC', ((getenv('HTTP_MOD_REWRITE_STATIC') === 'On' || getenv('REDIRECT_HTTP_MOD_REWRITE_STATIC') === 'On')));
|
$HTTP_MOD_REWRITE_STATIC = isset($_SERVER['HTTP_MOD_REWRITE_STATIC']) ? $_SERVER['HTTP_MOD_REWRITE_STATIC'] : getenv('HTTP_MOD_REWRITE_STATIC');
|
||||||
|
$REDIRECT_HTTP_MOD_REWRITE_STATIC = isset($_SERVER['REDIRECT_HTTP_MOD_REWRITE_STATIC']) ? $_SERVER['REDIRECT_HTTP_MOD_REWRITE_STATIC'] : getenv('REDIRECT_HTTP_MOD_REWRITE_STATIC');
|
||||||
|
define('e_MOD_REWRITE_STATIC', (($HTTP_MOD_REWRITE_STATIC === 'On' || $REDIRECT_HTTP_MOD_REWRITE_STATIC === 'On')));
|
||||||
}
|
}
|
||||||
|
|
||||||
$subdomain = false;
|
$subdomain = false;
|
||||||
|
Reference in New Issue
Block a user