Merge branch 'w03_MDL-31213_m22_attributesmess' of git://github.com/s…

…kodak/moodle into MOODLE_22_STABLE
moodle · Jan 17, 2012 · 2aa4f06 · 2aa4f06
2 parents 14a49d6 + fc0a719
commit 2aa4f06
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/lib/form/password.php b/lib/form/password.php
@@ -19,9 +19,14 @@ function MoodleQuickForm_password($elementName=null, $elementLabel=null, $attrib
         if (empty($CFG->xmlstrictheaders)) {
             // no standard mform in moodle should allow autocomplete of passwords
             // this is valid attribute in html5, sorry, we have to ignore validation errors in legacy xhtml 1.0
-            $attributes = (array)$attributes;
+            if (empty($attributes)) {
-            if (!isset($attributes['autocomplete'])) {
+                $attributes = array('autocomplete'=>'off');
+            } else if (is_array($attributes)) {
                 $attributes['autocomplete'] = 'off';
+            } else {
+                if (strpos($attributes, 'autocomplete') === false) {
+                    $attributes .= ' autocomplete="off" ';
+                }
             }
         }
 

diff --git a/lib/form/passwordunmask.php b/lib/form/passwordunmask.php
@@ -19,9 +19,14 @@ function MoodleQuickForm_passwordunmask($elementName=null, $elementLabel=null, $
         if (empty($CFG->xmlstrictheaders)) {
             // no standard mform in moodle should allow autocomplete of passwords
             // this is valid attribute in html5, sorry, we have to ignore validation errors in legacy xhtml 1.0
-            $attributes = (array)$attributes;
+            if (empty($attributes)) {
-            if (!isset($attributes['autocomplete'])) {
+                $attributes = array('autocomplete'=>'off');
+            } else if (is_array($attributes)) {
                 $attributes['autocomplete'] = 'off';
+            } else {
+                if (strpos($attributes, 'autocomplete') === false) {
+                    $attributes .= ' autocomplete="off" ';
+                }
             }
         }
         parent::MoodleQuickForm_password($elementName, $elementLabel, $attributes);

diff --git a/lib/formslib.php b/lib/formslib.php
@@ -143,9 +143,14 @@ function moodleform($action=null, $customdata=null, $method='post', $target='',
         if (empty($CFG->xmlstrictheaders)) {
             // no standard mform in moodle should allow autocomplete with the exception of user signup
             // this is valid attribute in html5, sorry, we have to ignore validation errors in legacy xhtml 1.0
-            $attributes = (array)$attributes;
+            if (empty($attributes)) {
-            if (!isset($attributes['autocomplete'])) {
+                $attributes = array('autocomplete'=>'off');
+            } else if (is_array($attributes)) {
                 $attributes['autocomplete'] = 'off';
+            } else {
+                if (strpos($attributes, 'autocomplete') === false) {
+                    $attributes .= ' autocomplete="off" ';
+                }
             }
         }