From 948471a44bd59fb31d9abdd2931a9eda0b5b6931 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 6 Jul 2017 22:51:56 +0300
Subject: self url path checking: accept value without an ending slash

---
 include/sanity_check.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/sanity_check.php')

diff --git a/include/sanity_check.php b/include/sanity_check.php
index f9f6575c8..2f5315edf 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -105,7 +105,9 @@
 						"Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
 			}
 
-			if (isset($_SERVER["HTTP_HOST"]) && SELF_URL_PATH != $ref_self_url_path && (!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS)) {
+			if (isset($_SERVER["HTTP_HOST"]) &&
+				(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
+                SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
 				array_push($errors,
 					"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
 			}
-- 
cgit v1.2.3