aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-05 16:51:32 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-05 16:51:32 +0000
commit08d3f7f2820ed971ce5171c9ce9e15dbf452cf3f (patch)
tree75fd0261d5f92442fae934a58a9404bc3ed162f1 /engine/lib
parent36ef345eb6425106f061fb866d9fa66d051e16df (diff)
downloadelgg-08d3f7f2820ed971ce5171c9ce9e15dbf452cf3f.tar.gz
elgg-08d3f7f2820ed971ce5171c9ce9e15dbf452cf3f.tar.bz2
Merged 5605:5622 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5623 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/entities.php5
-rw-r--r--engine/lib/input.php6
2 files changed, 6 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);