Put back defaults

libraries/cms/plugin/helper.php

@@ -145,7 +145,15 @@ public static function isEnabled($type, $plugin = null)
 	 */
 	public static function importPlugin($type, $plugin = null, $autocreate = true, JEventDispatcher $dispatcher = null)
 	{
-		static $loaded = array();
+		static $loaded = [];
+
+		// Check for the default args, if so we can optimise cheaply
+		$defaults = false;
+
+		if (is_null($plugin) && $autocreate == true && is_null($dispatcher))
+		{
+			$defaults = true;
+		}
 
 		// Ensure we have a dispatcher now so we can correctly track the loaded plugins
 		$dispatcher = $dispatcher ?: JEventDispatcher::getInstance();
@@ -158,7 +166,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J
 			$loaded[$dispatcherHash] = array();
 		}
 
-		if (!isset($loaded[$dispatcherHash][$type]))
+		if (!isset($loaded[$dispatcherHash][$type]) || !$defaults)
 		{
 			$results = null;
 
@@ -175,6 +183,12 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J
 				}
 			}
 
+			// Bail out early if we're not using default args
+			if (!$defaults)
+			{
+				return $results;
+			}
+
 			$loaded[$dispatcherHash][$type] = $results;
 		}