Fixes #2921 clearing new ignore internal variables

6 files changed, 13 insertions, 8 deletions

diff --git a/engine/lib/output.php b/engine/lib/output.php
index 04c737062..9479fee53 100644
--- a/engine/lib/output.php
+++ b/engine/lib/output.php
@@ -215,6 +215,14 @@ function elgg_clean_vars(array $vars = array()) {
 		unset($vars['internalid']);
 	}
 
+	if (isset($vars['__ignoreInternalid'])) {
+		unset($vars['__ignoreInternalid']);
+	}
+
+	if (isset($vars['__ignoreInternalname'])) {
+		unset($vars['__ignoreInternalname']);
+	}
+
 	return $vars;
 }
 
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 985858b85..db4b06949 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -49,7 +49,6 @@ $id = '';
 if (isset($vars['id'])) {
 	$id = "id=\"{$vars['id']}\"";
 	unset($vars['id']);
-	unset($vars['internalid']);
 }
 
 if (is_array($vars['value'])) {
diff --git a/views/default/input/date.php b/views/default/input/date.php
index ceeb2105c..35a951a0b 100644
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -44,7 +44,6 @@ if ($timestamp) {
 	$vars['class'] = "{$vars['class']} elgg-input-timestamp";
 	$vars['id'] = $vars['name'];
 	unset($vars['name']);
-	unset($vars['internalname']);
 }
 
 // convert timestamps to text for display
diff --git a/views/default/input/dropdown.php b/views/default/input/dropdown.php
index 4673a9301..9f07874f1 100644
--- a/views/default/input/dropdown.php
+++ b/views/default/input/dropdown.php
@@ -11,7 +11,7 @@
  * @uses $vars['value']          The current value, if any
  * @uses $vars['options']        An array of strings representing the options for the dropdown field
  * @uses $vars['options_values'] An associative array of "value" => "option"
- *                               where "value" is an internal name and "option" is
+ *                               where "value" is the name and "option" is
  * 								 the value displayed on the button. Replaces
  *                               $vars['options'] when defined.
  * @uses $vars['class']          Additional CSS class
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index a8b278efd..ef860a773 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -32,7 +32,6 @@ $id = '';
 if (isset($vars['id'])) {
 	$id = "id=\"{$vars['id']}\"";
 	unset($vars['id']);
-	unset($vars['internalid']);
 }
 
 $class = "elgg-input-radios elgg-{$vars['align']}";
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index dcd65072a..b852d24fc 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -6,15 +6,15 @@
  * @subpackage Core
  *
  * @uses $vars['value'] Array of user guids for already selected users or null
- * @uses $vars['name']  The name of the input field
  *
+ * The name of the hidden fields is members[]
  *
  * Defaults to lazy load user lists in paginated alphabetical order. User needs
- * two type two characters before seeing the user popup list.
+ * to type two characters before seeing the user popup list.
  *
  * As users are checked they move down to a "users" box.
- * When this happens, a hidden input is created also.
- * 	{$internalnal}[] with the value the GUID.
+ * When this happens, a hidden input is created with the
+ * name of members[] and a value of the GUID.
  *
  * @warning: this is not stable
  */