don't generate false internalid deprecation notices: http://trac.elgg.org/ticket...

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 2f1661e8344d848617deceab23399cf6b3939a28..f6e5aa6b8963efe06e7cb4f1b5f3b7bde7551ad0 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -411,19 +411,25 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
        }
 
        // internalname => name (1.8)
-       if (isset($vars['internalname']) && !isset($vars['name'])) {
+       if (isset($vars['internalname']) && !isset($vars['__ignoreInternalname']) && !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'])) {
+               if (!isset($vars['internalname'])) {
+                       $vars['__ignoreInternalname'] = '';
+               }
                $vars['internalname'] = $vars['name'];
        }
 
        // internalid => id (1.8)
-       if (isset($vars['internalid']) && !isset($vars['name'])) {
+       if (isset($vars['internalid']) && !isset($vars['__ignoreInternalid']) && !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'])) {
+               if (!isset($vars['internalid'])) {
+                       $vars['__ignoreInternalid'] = '';
+               }
                $vars['internalid'] = $vars['id'];
        }