diff options
-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
|