Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

2 files changed, 20 insertions, 3 deletions

diff --git a/js/classes/ElggPriorityList.js b/js/classes/ElggPriorityList.js
index 831342f21..b4cec5044 100644
--- a/js/classes/ElggPriorityList.js
+++ b/js/classes/ElggPriorityList.js
@@ -16,7 +16,10 @@ elgg.ElggPriorityList = function() {
  * @return {Void}
  */
 elgg.ElggPriorityList.prototype.insert = function(obj, opt_priority) {
-	var priority = parseInt(opt_priority || 500, 10);
+	var priority = 500;
+	if (arguments.length == 2 && opt_priority != undefined) {
+		priority = parseInt(opt_priority, 10);
+	}
 
 	priority = Math.max(priority, 0);
 
@@ -31,7 +34,7 @@ elgg.ElggPriorityList.prototype.insert = function(obj, opt_priority) {
 /**
  * Iterates through each element in order.
  *
-* Unlike every, this ignores the return value of the callback.
+ * Unlike every, this ignores the return value of the callback.
  *
  * @param {Function} callback The callback function to pass each element through. See
  *                            Array.prototype.every() for details.
diff --git a/js/classes/ElggUser.js b/js/classes/ElggUser.js
index 8a7a8b7eb..b8a976fba 100644
--- a/js/classes/ElggUser.js
+++ b/js/classes/ElggUser.js
@@ -6,9 +6,23 @@
  * @class Represents an ElggUser
  * @property {string} name
  * @property {string} username
+ * @property {string} language
+ * @property {boolean} admin
  */
 elgg.ElggUser = function(o) {
 	elgg.ElggEntity.call(this, o);
 };
 
-elgg.inherit(elgg.ElggUser, elgg.ElggEntity);
\ No newline at end of file
+elgg.inherit(elgg.ElggUser, elgg.ElggEntity);
+
+/**
+ * Is this user an admin?
+ *
+ * @warning The admin state of the user should be checked on the server for any
+ * actions taken that require admin privileges.
+ *
+ * @return {boolean}
+ */
+elgg.ElggUser.prototype.isAdmin = function() {
+	return this.admin;
+};
\ No newline at end of file