1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00

Issue #1821 - Inconsistent e_CURRENT_PLUGIN value.

This commit is contained in:
Cameron 2016-08-29 14:39:48 -07:00
parent bf392eaf0b
commit 334c17cb8e
2 changed files with 2 additions and 2 deletions

View File

@ -388,7 +388,7 @@ class eDispatcher
//if($custom) $custom = 'url/'.$custom;
if(!defined('e_CURRENT_PLUGIN'))
{
define('e_CURRENT_PLUGIN', $module); // TODO Move to a better location.
define('e_CURRENT_PLUGIN', rtrim($module,'/')); // TODO Move to a better location.
}
return $sc ? '{e_PLUGIN}'.$module.'url/'.$custom.'url.php' : e_PLUGIN.$module.'url/'.$custom.'url.php';
break;

View File

@ -3893,7 +3893,7 @@ class e107
{
$temp = substr($e107Path, strpos($e107Path, '/') +1);
$plugDir = substr($temp, 0, strpos($temp, '/'));
define('e_CURRENT_PLUGIN', $plugDir);
define('e_CURRENT_PLUGIN', rtrim($plugDir,'/'));
define('e_PLUGIN_DIR', e_PLUGIN.e_CURRENT_PLUGIN.'/');
define('e_PLUGIN_DIR_ABS', e_PLUGIN_ABS.e_CURRENT_PLUGIN.'/');
}