Remove manual include behaviors

joomla · Sep 23, 2016 · 8f66160 · 8f66160
1 parent 8d4e64c
commit 8f66160
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 54 deletions.
diff --git a/libraries/cms/menu/menu.php b/libraries/cms/menu/menu.php
@@ -119,24 +119,6 @@ public static function getInstance($client, $options = array())
 			// Create a JMenu object
 			$classname = 'JMenu' . ucfirst($client);
 
-			if (!class_exists($classname))
-			{
-				// @deprecated 4.0 Everything in this block is deprecated but the warning is only logged after the file_exists
-				// Load the menu object
-				$info = JApplicationHelper::getClientInfo($client, true);
-
-				if (is_object($info))
-				{
-					$path = $info->path . '/includes/menu.php';
-
-					if (file_exists($path))
-					{
-						JLog::add('Non-autoloadable JMenu subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
-						include_once $path;
-					}
-				}
-			}
-
 			if (!class_exists($classname))
 			{
 				throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_MENU_LOAD', $client), 500);

diff --git a/libraries/cms/pathway/pathway.php b/libraries/cms/pathway/pathway.php
@@ -69,24 +69,6 @@ public static function getInstance($client, $options = array())
 			// Create a JPathway object
 			$classname = 'JPathway' . ucfirst($client);
 
-			if (!class_exists($classname))
-			{
-				// @deprecated 4.0 Everything in this block is deprecated but the warning is only logged after the file_exists
-				// Load the pathway object
-				$info = JApplicationHelper::getClientInfo($client, true);
-
-				if (is_object($info))
-				{
-					$path = $info->path . '/includes/pathway.php';
-
-					if (file_exists($path))
-					{
-						JLog::add('Non-autoloadable JPathway subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
-						include_once $path;
-					}
-				}
-			}
-
 			if (!class_exists($classname))
 			{
 				throw new RuntimeException(JText::sprintf('JLIB_APPLICATION_ERROR_PATHWAY_LOAD', $client), 500);

diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
@@ -173,24 +173,6 @@ public static function getInstance($client, $options = array())
 			// Create a JRouter object
 			$classname = 'JRouter' . ucfirst($client);
 
-			if (!class_exists($classname))
-			{
-				// @deprecated 4.0 Everything in this block is deprecated but the warning is only logged after the file_exists
-				// Load the router object
-				$info = JApplicationHelper::getClientInfo($client, true);
-
-				if (is_object($info))
-				{
-					$path = $info->path . '/includes/router.php';
-
-					if (file_exists($path))
-					{
-						JLog::add('Non-autoloadable JRouter subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
-						include_once $path;
-					}
-				}
-			}
-
 			if (!class_exists($classname))
 			{
 				throw new RuntimeException(JText::sprintf('JLIB_APPLICATION_ERROR_ROUTER_LOAD', $client), 500);