3 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 7616849465..3d480b7e1c 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -892,7 +892,7 @@ class tools
 			}
 		}
 
-		// Add unqiue indexes?
+		// Add unique indexes?
 		if (!empty($schema_changes['add_unique_index']))
 		{
 			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
@@ -1303,7 +1303,7 @@ class tools
 	}
 
 	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
+	* Check if a specified index exists in table. Does not return PRIMARY KEY indexes.
 	*
 	* @param string	$table_name		Table to check the index at
 	* @param string	$index_name		The index name to check
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 24eb408b63..44fba06d9d 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -558,6 +558,10 @@ class log implements \phpbb\log\log_interface
 				$log[$i]['action'] = make_clickable($log[$i]['action']);
 				*/
 			}
+			else
+			{
+				$log[$i]['action'] = $this->user->lang($log[$i]['action']);
+			}
 
 			$i++;
 		}
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index a8e12c4063..fefef39c51 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -149,6 +149,16 @@ class path_helper
 		$script_name = $this->symfony_request->getScriptName();
 
 		/*
+		* If the path info is empty but we're using app.php, then we
+		*	might be using an empty route like app.php/ which is
+		*	supported by symfony's routing
+		*/
+		if ($path_info === '/' && preg_match('/app\.' . $this->php_ext . '\/$/', $request_uri))
+		{
+			return $this->web_root_path = $this->phpbb_root_path . '../';
+		}
+
+		/*
 		* If the path info is empty (single /), then we're not using
 		*	a route like app.php/foo/bar
 		*/