Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/src/forum/admin/settings.js

@@ -111,9 +111,7 @@ define(['uploader'], function(uploader) {
 				value = field.prop('checked') ? '1' : '0';
 				break;
 			}
-		} else if (field.is('textarea')) {
+		} else if (field.is('textarea') || field.is('select')) {
-			value = field.val();
-		} else if (field.is('select')) {
 			value = field.val();
 		}
 
@@ -144,7 +142,7 @@ define(['uploader'], function(uploader) {
 			});
 
 		});
-	};
+	}
 
 	return Settings;
 });