Merged 5605:5622 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5623 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 8 insertions, 5 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 987328adc..88cf3e3a7 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1969,9 +1969,8 @@ $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupp
 		$options['order_by'] = $order_by;
 	}
 
-	if ($limit) {
-		$options['limit'] = $limit;
-	}
+	// need to pass 0 for all option
+	$options['limit'] = $limit;
 
 	if ($offset) {
 		$options['offset'] = $offset;
diff --git a/engine/lib/input.php b/engine/lib/input.php
index e21c909fc..26416d646 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -77,8 +77,10 @@ function set_input($variable, $value) {
 
 /**
  * Filter tags from a given string based on registered hooks.
- * @param $var
- * @return mixed The filtered result
+ *
+ * @param mixed $var Anything that does not include an object (strings, ints, arrays)
+ *					This includes multi-dimensional arrays.
+ * @return mixed The filtered result - everything will be strings
  */
 function filter_tags($var) {
 	return trigger_plugin_hook('validate', 'input', null, $var);
diff --git a/engine/schema/mysql.sql b/engine/schema/mysql.sql
index 56c2a4077..23e81f39d 100644
--- a/engine/schema/mysql.sql
+++ b/engine/schema/mysql.sql
@@ -407,6 +407,7 @@ CREATE TABLE `prefix_users_entity` (
   `language` varchar(6) NOT NULL DEFAULT '',
   `code` varchar(32) NOT NULL DEFAULT '',
   `banned` enum('yes','no') NOT NULL DEFAULT 'no',
+  `admin` enum('yes','no') NOT NULL DEFAULT 'no',
   `last_action` int(11) NOT NULL DEFAULT '0',
   `prev_last_action` int(11) NOT NULL DEFAULT '0',
   `last_login` int(11) NOT NULL DEFAULT '0',
@@ -418,6 +419,7 @@ CREATE TABLE `prefix_users_entity` (
   KEY `code` (`code`),
   KEY `last_action` (`last_action`),
   KEY `last_login` (`last_login`),
+  KEY `admin` (`admin`),
   FULLTEXT KEY `name` (`name`),
   FULLTEXT KEY `name_2` (`name`,`username`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;