From 56d9f24a7dc866ea1070f52ab6ceb1c7268005d2 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 16 Jun 2009 15:16:23 +0000 Subject: Marcus Povey 20090616: * Closes #964: Introduces a plugin hook 'annotations:view', $entity_class (object/user/group/site) called elgg_view_entity on FULL view. This lets you return annotations to an entity and control the order in which they're displayed. Existing views remain un-effected but should probably be retrofitted. * Version bump. git-svn-id: https://code.elgg.org/elgg/trunk@3337 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 15 +++++++++++++++ version.php | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index b80bd9f70..3846c98b2 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -633,6 +633,21 @@ 'entity' => $entity, 'full' => $full ), $bypass, $debug); + } + if ($full) // Marcus Povey 20090616 : Speculative and low impact approach for fixing #964 + { + $annotations = trigger_plugin_hook('annotations:view', $entity_class, array( + 'entity' => $entity, + 'full' => $full, + + // We already know this, so pass it on. + 'type' => $entity_type, + 'subtype' => $subtype + ) + ); + + if ($annotations) + $contents .= $annotations; } return $contents; } diff --git a/version.php b/version.php index 4c98fe0e0..2a0c78577 100644 --- a/version.php +++ b/version.php @@ -13,7 +13,7 @@ * @link http://elgg.org/ */ - $version = 2009061401; // YYYYMMDD = Elgg Date + $version = 2009061601; // YYYYMMDD = Elgg Date // XX = Interim incrementer $release = '1.5'; // Human-friendly version name -- cgit v1.2.3