Merge branch '0.8.x' into userdesign

Conflicts:
	actions/designsettings.php

1 files changed, 2 insertions, 2 deletions

diff --git a/js/jquery.form.js b/js/jquery.form.js
index cb8b5a660..936b847ab 100644
--- a/js/jquery.form.js
+++ b/js/jquery.form.js
@@ -157,7 +157,7 @@ $.fn.ajaxSubmit = function(options) {
     function fileUpload() {

         var form = $form[0];

         

-        if ($(':input[@name=submit]', form).length) {

+        if ($(':input[name=submit]', form).length) {

             alert('Error: Form elements must not be named "submit".');

             return;

         }

@@ -570,7 +570,7 @@ $.fn.clearForm = function() {
 $.fn.clearFields = $.fn.clearInputs = function() {

     return this.each(function() {

         var t = this.type, tag = this.tagName.toLowerCase();

-        if (t == 'text' || t == 'password' || tag == 'textarea')

+        if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea')

             this.value = '';

         else if (t == 'checkbox' || t == 'radio')

             this.checked = false;