Fixes #2921 clearing new ignore internal variables

diff --git a/engine/lib/output.php b/engine/lib/output.php
index 04c7370620134796f99da20d440fc298a975faa6..9479fee530a582f669fc6e87875d2cda37a92c95 100644 (file)
--- 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 985858b856e8f3639d3a997de5434796afe2c363..db4b06949c5fa8c6b41fcf27e921fa04bb85dca7 100644 (file)
--- 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 ceeb2105ca3f71574120823a9b35d50fdb9f3747..35a951a0bf416e1f129a3312a21897468a0f2b68 100644 (file)
--- 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 4673a930196df9993bb80b64003949c4f3678c9e..9f07874f1f2c156b9dc6eb72742b809eb651c974 100644 (file)
--- 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 a8b278efd04c398143467f9b034155eacda35412..ef860a773bd866b2ebd8ef177f5a2c932d6f72e1 100644 (file)
--- 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 dcd65072a5f613a664ad31d7dc7bb11c8a42dadf..b852d24fc427b651f88dcfd319772d407c6b00ab 100644 (file)
--- 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
  */