diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-06-16 15:16:23 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-06-16 15:16:23 +0000 |
| commit | 56d9f24a7dc866ea1070f52ab6ceb1c7268005d2 (patch) | |
| tree | cf8a0464fa23a2c2c66e91be36ba211cda1ae3a1 | |
| parent | 8b3dd7fbcea3987d28cf958e485635bd8e256a27 (diff) | |
| download | elgg-56d9f24a7dc866ea1070f52ab6ceb1c7268005d2.tar.gz elgg-56d9f24a7dc866ea1070f52ab6ceb1c7268005d2.tar.bz2 | |
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
| -rw-r--r-- | engine/lib/elgglib.php | 15 | ||||
| -rw-r--r-- | version.php | 2 |
2 files changed, 16 insertions, 1 deletions
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
|