From 5c13b26a250c5bd8cc18790d5b39fc46c86020f8 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 30 Jul 2008 13:54:45 +0000 Subject: Refs #186: Get URL for relationships git-svn-id: https://code.elgg.org/elgg/trunk@1601 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/extender.php | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'engine/lib/extender.php') diff --git a/engine/lib/extender.php b/engine/lib/extender.php index 20b1750f5..e444a4d55 100644 --- a/engine/lib/extender.php +++ b/engine/lib/extender.php @@ -375,7 +375,7 @@ if (!isset($CONFIG->extender_url_handler[$extender_type])) { $CONFIG->extender_url_handler[$extender_type] = array(); } - $CONFIG->entity_url_handler[$extender_type][$extender_name] = $function_name; + $CONFIG->extender_url_handler[$extender_type][$extender_name] = $function_name; return true; @@ -391,33 +391,32 @@ { global $CONFIG; - $view = elgg_get_viewtype(); - $guid = $extender->entity_guid; - $type = $extender->type; - - $url = ""; - - $function = ""; - if (isset($CONFIG->extender_url_handler[$type][$extender->name])) - $function = $CONFIG->extender_url_handler[$type][$extender->name]; - if (isset($CONFIG->extender_url_handler[$type]['all'])) - $function = $CONFIG->extender_url_handler[$type]['all']; - if (isset($CONFIG->extender_url_handler['all']['all'])) - $function = $CONFIG->extender_url_handler['all']['all']; - - if (is_callable($function)) { - $url = $function($extender); - } + $guid = $extender->entity_guid; + $type = $extender->type; + + $url = ""; + + $function = ""; + if (isset($CONFIG->extender_url_handler[$type][$extender->name])) + $function = $CONFIG->extender_url_handler[$type][$extender->name]; + if (isset($CONFIG->extender_url_handler[$type]['all'])) + $function = $CONFIG->extender_url_handler[$type]['all']; + if (isset($CONFIG->extender_url_handler['all']['all'])) + $function = $CONFIG->extender_url_handler['all']['all']; - if ($url == "") { - $nameid = $extender->id; - if ($type == 'volatile') - $nameid== $extender->name; - $url = $CONFIG->wwwroot . "export/$view/$guid/$type/$nameid/"; - } - return $url; + if (is_callable($function)) { + $url = $function($extender); + } + + if ($url == "") { + $nameid = $extender->id; + if ($type == 'volatile') + $nameid== $extender->name; + $url = $CONFIG->wwwroot . "export/$view/$guid/$type/$nameid/"; + } + return $url; } /** Register the hook */ -- cgit v1.2.3