Fixed erroneous notices about full_view when passing $vars directly to another view...

git-svn-id: http://code.elgg.org/elgg/trunk@9012 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/views.php b/engine/lib/views.php
index e2cf6b5c300c93133ed669f2b3351be981996242..c2685b073b6e90b7bcdbc91ad3f570445d5f1ffd 100644 (file)
--- 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'];
        }