aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/views.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-22 16:53:26 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-22 16:53:26 +0000
commita420564b52626639d2fc2d563d6ccd80eef72986 (patch)
tree12e27412a4615f8f0211d464968bbe6a4bda891a /engine/lib/views.php
parent7b44f21a13862975853eb9848493923bbd0417c1 (diff)
downloadelgg-a420564b52626639d2fc2d563d6ccd80eef72986.tar.gz
elgg-a420564b52626639d2fc2d563d6ccd80eef72986.tar.bz2
Fixed erroneous notices about full_view when passing $vars directly to another view within a view.
git-svn-id: http://code.elgg.org/elgg/trunk@9012 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/views.php')
-rw-r--r--engine/lib/views.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index e2cf6b5c3..c2685b073 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -395,7 +395,9 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
}
// full_view is the new preferred key for full view on entities @see elgg_view_entity()
- if (isset($vars['full'])) {
+ // check if full_view is set because that means we've already rewritten it and this is
+ // coming from another view passing $vars directly.
+ if (isset($vars['full']) && !isset($vars['full_view'])) {
elgg_deprecated_notice("Use \$vars['full_view'] instead of \$vars['full']", 1.8);
$vars['full_view'] = $vars['full'];
}