1 files changed, 37 insertions, 27 deletions

diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index 845cfd85f..8323bd3ce 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -19,7 +19,7 @@
  * @return string
  */
 function detect_extender_valuetype($value, $value_type = "") {
-	if ($value_type != "") {
+	if ($value_type != "" && ($value_type == 'integer' || $value_type == 'text')) {
 		return $value_type;
 	}
 
@@ -44,6 +44,7 @@ function detect_extender_valuetype($value, $value_type = "") {
  * @param ODDMetaData $element The OpenDD element
  *
  * @return bool
+ * @access private
  */
 function oddmetadata_to_elggextender(ElggEntity $entity, ODDMetaData $element) {
 	// Get the type of extender (metadata, type, attribute etc)
@@ -85,6 +86,7 @@ function oddmetadata_to_elggextender(ElggEntity $entity, ODDMetaData $element) {
  * @return null
  * @elgg_plugin_hook_handler volatile metadata
  * @todo investigate more.
+ * @throws ImportException
  * @access private
  */
 function import_extender_plugin_hook($hook, $entity_type, $returnvalue, $params) {
@@ -93,18 +95,20 @@ function import_extender_plugin_hook($hook, $entity_type, $returnvalue, $params)
 	$tmp = NULL;
 
 	if ($element instanceof ODDMetaData) {
+		/* @var ODDMetaData $element */
 		// Recall entity
 		$entity_uuid = $element->getAttribute('entity_uuid');
 		$entity = get_entity_from_uuid($entity_uuid);
 		if (!$entity) {
-			throw new ImportException(sprintf(elgg_echo('ImportException:GUIDNotFound'), $entity_uuid));
+			throw new ImportException(elgg_echo('ImportException:GUIDNotFound', array($entity_uuid)));
 		}
 
 		oddmetadata_to_elggextender($entity, $element);
 
 		// Save
 		if (!$entity->save()) {
-			$msg = sprintf(elgg_echo('ImportException:ProblemUpdatingMeta'), $attr_name, $entity_uuid);
+			$attr_name = $element->getAttribute('name');
+			$msg = elgg_echo('ImportException:ProblemUpdatingMeta', array($attr_name, $entity_uuid));
 			throw new ImportException($msg);
 		}
 
@@ -119,62 +123,68 @@ function import_extender_plugin_hook($hook, $entity_type, $returnvalue, $params)
  * @param string $type        'metadata' or 'annotation'
  * @param int    $user_guid   The GUID of the user
  *
- * @return true|false
+ * @return bool
  */
 function can_edit_extender($extender_id, $type, $user_guid = 0) {
-	if (!isloggedin()) {
-		return false;
+	// @todo Since Elgg 1.0, Elgg has returned false from can_edit_extender()
+	// if no user was logged in. This breaks the access override. This is a
+	// temporary work around. This function needs to be rewritten in Elgg 1.9 
+	if (!elgg_check_access_overrides($user_guid)) {
+		if (!elgg_is_logged_in()) {
+			return false;
+		}
 	}
 
 	$user_guid = (int)$user_guid;
-	$user = get_entity($user_guid);
+	$user = get_user($user_guid);
 	if (!$user) {
-		$user = get_loggedin_user();
+		$user = elgg_get_logged_in_user_entity();
+		$user_guid = elgg_get_logged_in_user_guid();
 	}
 
-	$functionname = "get_{$type}";
+	$functionname = "elgg_get_{$type}_from_id";
 	if (is_callable($functionname)) {
-		$extender = $functionname($extender_id);
+		$extender = call_user_func($functionname, $extender_id);
 	} else {
 		return false;
 	}
 
-	if (!is_a($extender, "ElggExtender")) {
+	if (!($extender instanceof ElggExtender)) {
 		return false;
 	}
+	/* @var ElggExtender $extender */
 
 	// If the owner is the specified user, great! They can edit.
-	if ($extender->getOwner() == $user->getGUID()) {
+	if ($extender->getOwnerGUID() == $user_guid) {
 		return true;
 	}
 
 	// If the user can edit the entity this is attached to, great! They can edit.
-	if (can_edit_entity($extender->entity_guid, $user->getGUID())) {
+	if (can_edit_entity($extender->entity_guid, $user_guid)) {
 		return true;
 	}
 
-	// Trigger plugin hooks
-	$params = array('entity' => $entity, 'user' => $user);
-	return trigger_plugin_hook('permissions_check', $type, $params, false);
+	// Trigger plugin hook - note that $user may be null
+	$params = array('entity' => $extender->getEntity(), 'user' => $user);
+	return elgg_trigger_plugin_hook('permissions_check', $type, $params, false);
 }
 
 /**
  * Sets the URL handler for a particular extender type and name.
  * It is recommended that you do not call this directly, instead use
- * one of the wrapper functions in the subtype files.
+ * one of the wrapper functions such as elgg_register_annotation_url_handler().
  *
- * @param string $function_name The function to register
- * @param string $extender_type Extender type
+ * @param string $extender_type Extender type ('annotation', 'metadata')
  * @param string $extender_name The name of the extender
+ * @param string $function_name The function to register
  *
- * @return true|false Depending on success
+ * @return bool
  */
-function register_extender_url_handler($function_name, $extender_type = "all",
-$extender_name = "all") {
+function elgg_register_extender_url_handler($extender_type, $extender_name, $function_name) {
 
 	global $CONFIG;
 
-	if (!is_callable($function_name)) {
+	if (!is_callable($function_name, true)) {
 		return false;
 	}
 
@@ -221,19 +231,19 @@ function get_extender_url(ElggExtender $extender) {
 	}
 
 	if (is_callable($function)) {
-		$url = $function($extender);
+		$url = call_user_func($function, $extender);
 	}
 
 	if ($url == "") {
 		$nameid = $extender->id;
 		if ($type == 'volatile') {
-			$nameid == $extender->name;
+			$nameid = $extender->name;
 		}
 		$url = "export/$view/$guid/$type/$nameid/";
 	}
-	
+
 	return elgg_normalize_url($url);
 }
 
 /** Register the hook */
-register_plugin_hook("import", "all", "import_extender_plugin_hook", 2);
\ No newline at end of file
+elgg_register_plugin_hook_handler("import", "all", "import_extender_plugin_hook", 2);