aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-20 08:58:28 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-20 08:58:28 +0000
commit0be1be0cdecefc9fc7c89c736525ee0dff1565c6 (patch)
tree4779496631ab480f00000482664cf50c6d75c00e /engine/lib
parent68957d21b50d99b25f23e17773599639738425e0 (diff)
downloadelgg-0be1be0cdecefc9fc7c89c736525ee0dff1565c6.tar.gz
elgg-0be1be0cdecefc9fc7c89c736525ee0dff1565c6.tar.bz2
Fixes #2615: Viewtype now included in views plugin hooks
git-svn-id: http://code.elgg.org/elgg/trunk@7371 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/views.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index c296fa1ac..f20eabfbf 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -326,16 +326,15 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
$content = ob_get_clean();
// Plugin hook
- $content = elgg_trigger_plugin_hook('view', $view_orig,
- array('view' => $view_orig, 'vars' => $vars), $content);
+ $params = array('view' => $view_orig, 'vars' => $vars, 'viewtype' => $viewtype);
+ $content = elgg_trigger_plugin_hook('view', $view_orig, $params, $content);
- // backward compatibility with less grandular hook will be gone in 2.0
- $params = array('view' => $view_orig, 'vars' => $vars);
+ // backward compatibility with less granular hook will be gone in 2.0
$content_tmp = elgg_trigger_plugin_hook('display', 'view', $params, $content);
if ($content_tmp != $content) {
$content = $content_tmp;
- elgg_deprecated_notice('The display:view plugin hook is deprecated by view:view_name or view:all', 1.8);
+ elgg_deprecated_notice('The display:view plugin hook is deprecated by view:view_name', 1.8);
}
return $content;