Fixes #4025 added a url handler for comments

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index e40ab2e39179dc09fef438304c1c1da902895496..bfd40d1e8032f9efc684d19b5a70e190efe2b90a 100644 (file)
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -528,6 +528,20 @@ function elgg_annotation_exists($entity_guid, $annotation_type, $owner_guid = NU
        return FALSE;
 }
 
+/**
+ * Return the URL for a comment
+ *
+ * @param ElggAnnotation $comment The comment object 
+ * @return string
+ * @access private
+ */
+function elgg_comment_url_handler(ElggAnnotation $comment) {
+       $entity = $comment->getEntity();
+       if ($entity) {
+               return $entity->getURL() . '#item-annotation-' . $comment->id;
+       }
+}
+
 /**
  * Register an annotation url handler.
  *
@@ -540,11 +554,6 @@ function elgg_register_annotation_url_handler($extender_name = "all", $function_
        return elgg_register_extender_url_handler('annotation', $extender_name, $function_name);
 }
 
-/** Register the hook */
-elgg_register_plugin_hook_handler("export", "all", "export_annotation_plugin_hook", 2);
-
-elgg_register_plugin_hook_handler('unit_test', 'system', 'annotations_test');
-
 /**
  * Register annotation unit tests
  * @access private
@@ -554,3 +563,16 @@ function annotations_test($hook, $type, $value, $params) {
        $value[] = $CONFIG->path . 'engine/tests/api/annotations.php';
        return $value;
 }
+
+/**
+ * Initialize the annotation library
+ * @access private
+ */
+function elgg_annotations_init() {
+       elgg_register_annotation_url_handler('generic_comment', 'elgg_comment_url_handler');
+
+       elgg_register_plugin_hook_handler("export", "all", "export_annotation_plugin_hook", 2);
+       elgg_register_plugin_hook_handler('unit_test', 'system', 'annotations_test');
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_annotations_init');