From 83c52c8bd8639834df17d502de8442b855c749be Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 1 Jun 2021 16:36:09 -0700
Subject: [PATCH] Use e107::route() to safely get e_ROUTE value.

---
 e107_handlers/e107_class.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index a9e893d58..16a03ed38 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -4079,15 +4079,21 @@ class e107
 		return null;
 	}
 
-
-	public static function route($route)
+	/**
+	 * Set the route or get the current route when $route is null.
+	 * @param string $route
+	 * @return string|null
+	 */
+	public static function route($route = null)
 	{
 		if(defined('e_ROUTE'))
 		{
-			return null;
+			return e_ROUTE;
 		}
 
 		define('e_ROUTE', $route);
+
+		return null;
 	}