From 0c8668ee51cdb160aa905236806da0949bbfa0a0 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 11 Aug 2020 09:57:39 -0700
Subject: [PATCH] PHP Error removal when using CLI.

---
 e107_handlers/e107_class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 61dc8bb80..b90bf9230 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -4261,7 +4261,10 @@ class e107
 			}
 		}
 
-		if($_SERVER['PHP_SELF'] == "") { $_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME']; }
+		if ($_SERVER['PHP_SELF'] == "" && !empty($_SERVER['SCRIPT_NAME']))
+		{
+			$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'];
+		}
 
 		$http_path = dirname($_SERVER['PHP_SELF']);
 		$http_path = explode("/", $http_path);
@@ -4479,6 +4482,11 @@ class e107
 			$_SERVER['PHP_SELF'] = $requestUrl;
 		}*/
 
+		if(self::isCli() && !empty($_SERVER['_']) && empty($_SERVER['SCRIPT_FILENAME']))
+		{
+			$_SERVER['SCRIPT_FILENAME'] = $_SERVER['_'];
+		}
+
 		$eSelf = !empty($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME'];
 		$_self = $this->HTTP_SCHEME.'://'.$_SERVER['HTTP_HOST'].$eSelf;