1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 10:20:45 +02:00

Bugtracker #4103 - Now {PLUGIN} shortcode returns output rather than just echoing it

This commit is contained in:
mcfly
2007-10-07 21:21:26 +00:00
parent f114992c57
commit e85537049f

View File

@@ -3,6 +3,7 @@ $menu = $parm;
$path = $tp -> toDB(dirname($menu)); $path = $tp -> toDB(dirname($menu));
$name = $tp -> toDB(basename($menu)); $name = $tp -> toDB(basename($menu));
$plugin_file = "";
if($path == '.') if($path == '.')
{ {
$path = $menu; $path = $menu;
@@ -50,8 +51,7 @@ if($sql->db_Select('menus','menu_id, menu_pages',"menu_name = '$name' AND (menu_
include_once(e_PLUGIN.$path."/languages/English.php"); include_once(e_PLUGIN.$path."/languages/English.php");
} }
} }
include_once(e_PLUGIN.$path."/".$name.".php"); $plugin_file = e_PLUGIN.$path."/".$name.".php";
$sql->db_Mark_Time("(After $name)");
} }
} }
else else
@@ -60,7 +60,16 @@ else
{ {
$sql->db_Mark_Time($name); $sql->db_Mark_Time($name);
include_lan(e_PLUGIN.$path."/languages/".e_LANGUAGE.".php"); include_lan(e_PLUGIN.$path."/languages/".e_LANGUAGE.".php");
include_once(e_PLUGIN.$path."/".$name.".php"); $plugin_file = e_PLUGIN.$path."/".$name.".php";
$sql->db_Mark_Time("(After $name)");
} }
} }
if($plugin_file != "")
{
ob_start();
include(e_PLUGIN.$path."/".$name.".php");
$buff = ob_get_contents();
ob_end_clean();
$sql->db_Mark_Time("(After $name)");
return $buff;
}