Drop support for the legacy plug-in path.

joomla · May 3, 2012 · a82d620 · a82d620
1 parent 5d1a16c
commit a82d620
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/libraries/joomla/plugin/helper.php b/libraries/joomla/plugin/helper.php
@@ -156,16 +156,12 @@ protected static function _import($plugin, $autocreate = true, JEventDispatcher
 		$plugin->type = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->type);
 		$plugin->name = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->name);
 
-		$legacypath = JPATH_PLUGINS . '/' . $plugin->type . '/' . $plugin->name . '.php';
 		$path = JPATH_PLUGINS . '/' . $plugin->type . '/' . $plugin->name . '/' . $plugin->name . '.php';
 
-		if (!isset($paths[$path]) || !isset($paths[$legacypath]))
+		if (!isset($paths[$path]))
 		{
-			$pathExists = file_exists($path);
-			if ($pathExists || file_exists($legacypath))
+			if (file_exists($path))
 			{
-				$path = $pathExists ? $path : $legacypath;
-
 				if (!isset($paths[$path]))
 				{
 					require_once $path;