From 03b91e29c97440fe94e627fbba3c199f55f7ddb1 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 22 Sep 2013 08:13:19 +1000
Subject: [PATCH] Fixed automatic $config['root'] detection with mod.php

---
 inc/config.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 2bdd3131..5105c25f 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1000,9 +1000,14 @@
 
 	// The root directory, including the trailing slash, for Tinyboard.
 	// Examples: '/', 'http://boards.chan.org/', '/chan/'.
-	if (isset($_SERVER['REQUEST_URI']))
-		$config['root']	 = str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/';
-	else
+	if (isset($_SERVER['REQUEST_URI'])) {
+		$request_uri = $_SERVER['REQUEST_URI'];
+		if (isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] !== '')
+			$request_uri = substr($request_uri, 0, - 1 - strlen($_SERVER['QUERY_STRING']));
+		$config['root']	 = str_replace('\\', '/', dirname($request_uri)) == '/'
+			? '/' : str_replace('\\', '/', dirname($request_uri)) . '/';
+		unset($request_uri);
+	} else
 		$config['root'] = '/'; // CLI mode
 
 	// The scheme and domain. This is used to get the site's absolute URL (eg. for image identification links).