Fixed rewriting for internalid and internalname to not cause false deprecation notice...

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

diff --git a/engine/lib/views.php b/engine/lib/views.php
index c2685b073b6e90b7bcdbc91ad3f570445d5f1ffd..45b2c35f847ed9264ab73e3c9ea422183ad032d3 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -398,7 +398,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
        // 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);
+               elgg_deprecated_notice("Use \$vars['full_view'] instead of \$vars['full']", 1.8, 2);
                $vars['full_view'] = $vars['full'];
        }
        if (isset($vars['full_view'])) {
@@ -406,16 +406,17 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
        }
 
        // internalname => name (1.8)
-       if (isset($vars['internalname'])) {
-               elgg_deprecated_notice('You should pass $vars[\'name\'] now instead of $vars[\'internalname\']', 1.8);
+       if (isset($vars['internalname']) && !isset($vars['name'])) {
+               elgg_deprecated_notice('You should pass $vars[\'name\'] now instead of $vars[\'internalname\']', 1.8, 2);
                $vars['name'] = $vars['internalname'];
+               $test=false;
        } elseif (isset($vars['name'])) {
                $vars['internalname'] = $vars['name'];
        }
 
        // internalid => id (1.8)
-       if (isset($vars['internalid'])) {
-               elgg_deprecated_notice('You should pass $vars[\'id\'] now instead of $vars[\'internalid\']', 1.8);
+       if (isset($vars['internalid']) && !isset($vars['name'])) {
+               elgg_deprecated_notice('You should pass $vars[\'id\'] now instead of $vars[\'internalid\']', 1.8, 2);
                $vars['id'] = $vars['internalid'];
        } elseif (isset($vars['id'])) {
                $vars['internalid'] = $vars['id'];