Permalink
Browse files

Drop support for the legacy plug-in path.

  • Loading branch information...
1 parent 5d1a16c commit a82d620085eb5fe60f3e7c489ca7157a2cab00b6 @realityking realityking committed May 3, 2012
Showing with 2 additions and 6 deletions.
  1. +2 −6 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;

0 comments on commit a82d620

Please sign in to comment.