2 files changed, 35 insertions, 12 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 4d240f9380..50bbad5fce 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -36,10 +36,10 @@ class phpbb_controller_helper
 	protected $user;
 
 	/**
-	* Request object
-	* @var phpbb_request
+	* config object
+	* @var phpbb_config
 	*/
-	protected $request;
+	protected $config;
 
 	/**
 	* phpBB root path
@@ -61,11 +61,11 @@ class phpbb_controller_helper
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_template $template, phpbb_user $user, phpbb_request_interface $request, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_template $template, phpbb_user $user, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->template = $template;
 		$this->user = $user;
-		$this->request = $request;
+		$this->config = $config;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 	}
@@ -109,14 +109,12 @@ class phpbb_controller_helper
 			$route = substr($route, 0, $route_delim);
 		}
 
-		$request_uri = $this->request->variable('REQUEST_URI', '', false, phpbb_request::SERVER);
-		$script_name = $this->request->variable('SCRIPT_NAME', '', false, phpbb_request::SERVER);
-
-		// If the app.php file is being used (no rewrite) keep it in the URL.
-		// Otherwise, don't include it.
+		// If enable_mod_rewrite is false, we need to include app.php
 		$route_prefix = $this->phpbb_root_path;
-		$parts = explode('/', $script_name);
-		$route_prefix .= strpos($request_uri, $script_name) === 0 ? array_pop($parts) . '/' : '';
+		if (empty($this->config['enable_mod_rewrite']))
+		{
+			$route_prefix .= 'app.' . $this->php_ext . '/';
+		}
 
 		return append_sid($route_prefix . "$route" . $route_params, $params, $is_amp, $session_id);
 	}
diff --git a/phpBB/phpbb/db/migration/data/310/mod_rewrite.php b/phpBB/phpbb/db/migration/data/310/mod_rewrite.php
new file mode 100644
index 0000000000..85ce25abf3
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/310/mod_rewrite.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_mod_rewrite extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('enable_mod_rewrite', '0')),
+		);
+	}
+}