aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/relationships.php
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 21:53:48 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 21:53:48 +0000
commitbe37104ac63cd25f2eac831ca03d6d2b19976e1c (patch)
tree5b168134f2b07933831daedd8cf2641ffb6c5c7d /engine/lib/relationships.php
parentd45a24be28b2eb2d0c2731708b589788a5b87215 (diff)
downloadelgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.gz
elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.bz2
Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually merged due to standardization of code in trunk but not branch)
git-svn-id: http://code.elgg.org/elgg/trunk@6848 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/relationships.php')
-rw-r--r--engine/lib/relationships.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index f1d119452..dd59b8d3f 100644
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -625,9 +625,7 @@ $count = false, $site_guid = 0) {
$options['owner_guid'] = $owner_guid;
}
- if ($limit) {
- $options['limit'] = $limit;
- }
+ $options['limit'] = $limit;
if ($offset) {
$options['offset'] = $offset;