Refs #2610: Using call_user_func in url hooks

git-svn-id: http://code.elgg.org/elgg/trunk@8139 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index fb4cdd2e60f16ba45094a29c176faa03e52e72f8..459f05adae6cbcbae6bc9290ae700c980f793f3e 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1783,17 +1783,17 @@ function get_entity_url($entity_guid) {
                if (isset($CONFIG->entity_url_handler[$entity->getType()][$entity->getSubType()])) {
                        $function = $CONFIG->entity_url_handler[$entity->getType()][$entity->getSubType()];
                        if (is_callable($function)) {
-                               $url = $function($entity);
+                               $url = call_user_func($function, $entity);
                        }
                } elseif (isset($CONFIG->entity_url_handler[$entity->getType()]['all'])) {
                        $function = $CONFIG->entity_url_handler[$entity->getType()]['all'];
                        if (is_callable($function)) {
-                               $url = $function($entity);
+                               $url = call_user_func($function, $entity);
                        }
                } elseif (isset($CONFIG->entity_url_handler['all']['all'])) {
                        $function = $CONFIG->entity_url_handler['all']['all'];
                        if (is_callable($function)) {
-                               $url = $function($entity);
+                               $url = call_user_func($function, $entity);
                        }
                }
 

diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index f0fc98d1233f228fcc761076e0ce5f8d1f1bef9e..90cc54805c7135f64fdbaf07b00bb9a89c666afb 100644 (file)
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -221,7 +221,7 @@ function get_extender_url(ElggExtender $extender) {
        }
 
        if (is_callable($function)) {
-               $url = $function($extender);
+               $url = call_user_func($function, $extender);
        }
 
        if ($url == "") {

diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index c032ff5b9a954b2a980d4ec15b0c0cd10b208f6b..0370a1e825703cf0749154689817d586176eab27 100644 (file)
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -432,7 +432,7 @@ function get_relationship_url($id) {
                }
 
                if (is_callable($function)) {
-                       $url = $function($relationship);
+                       $url = call_user_func($function, $relationship);
                }
 
                if ($url == "") {