mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Fixes #2797 during install. htaccess fix for when Apache "MultiViews" is enabled and messes up News SEF URLs.

Browse Source
This commit is contained in:
Cameron
2017-09-23 16:22:06 -07:00
parent 13d58de464
commit 75fcecf23c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107.htaccess
View File

@@ -34,7 +34,7 @@
Deny from env=HTTP_SAFE_BADBOT Deny from env=HTTP_SAFE_BADBOT
### Disable directory listing ### Disable directory listing
Options -Indexes Options -Indexes -MultiViews
### limit file uploads to 10mb ### limit file uploads to 10mb
### LimitRequestBody 10240000 ### LimitRequestBody 10240000

14
e107_handlers/application.php
View File

@@ -333,7 +333,7 @@ class eFront
$request->setDispatched(true); $request->setDispatched(true);
$router = $this->getRouter(); $router = $this->getRouter();
// If current request not already routed outside the dispatch method, route it // If current request not already routed outside the dispatch method, route it
if(!$request->routed) $router->route($request); if(!$request->routed) $router->route($request);
@@ -1034,7 +1034,7 @@ class eRouter
*/ */
protected function _init() protected function _init()
{ {
// Gather all rules, add-on info, cache, module for main namespace etc // Gather all rules, add-on info, cache, module for main namespace etc
$this->_loadConfig() $this->_loadConfig()
->setAliases(); ->setAliases();
// we need config first as setter does some checks if module can be set as main // we need config first as setter does some checks if module can be set as main
@@ -1101,8 +1101,8 @@ class eRouter
$config[$module] = $config[$module]['config']; $config[$module] = $config[$module]['config'];
} }
$this->_globalConfig = $config; $this->_globalConfig = $config;
$this->setRuleSets($rules); $this->setRuleSets($rules);
return $this; return $this;
} }
@@ -1645,7 +1645,7 @@ class eRouter
$aliases = e107::findPref('url_aliases/'.$lanCode, array()); $aliases = e107::findPref('url_aliases/'.$lanCode, array());
} }
$this->_aliases = $aliases; $this->_aliases = $aliases;
return $this; return $this;
} }
@@ -1757,7 +1757,7 @@ class eRouter
} }
private function _debug($label,$val, $line) private function _debug($label,$val=null, $line=null)
{ {
if(!deftrue('e_DEBUG_SEF')) if(!deftrue('e_DEBUG_SEF'))
{ {
@@ -1990,7 +1990,7 @@ class eRouter
public function checkLegacy(eRequest $request) public function checkLegacy(eRequest $request)
{ {
$module = $request->getModule(); $module = $request->getModule();
// forward from controller to a legacy module - bad stuff // forward from controller to a legacy module - bad stuff
if(!$request->isDispatched() && $this->getConfigValue($module, 'legacy')) if(!$request->isDispatched() && $this->getConfigValue($module, 'legacy'))
{ {