summaryrefslogtreecommitdiff
path: root/modules/search
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@227.1.241.10.in-addr.arpa>2010-06-14 14:43:14 -0400
committerChad Kieffer <ckieffer@227.1.241.10.in-addr.arpa>2010-06-14 14:43:14 -0400
commit3c6e710aa75b309fd7ff50aa8f5c58721b17770f (patch)
tree062b516f3fad5921e4ace326fa6b2f7f868ca87e /modules/search
parent782c1e0ae0bc597629abcd88f844d863da45901a (diff)
parent793780daa7665f7f86994235c4263fcb63554eb8 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/search')
-rw-r--r--modules/search/helpers/search.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 22f83218..24c4ed2b 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -42,7 +42,7 @@ class search_Core {
$data = $db->query($query);
$count = $db->query("SELECT FOUND_ROWS() as c")->current()->c;
- return array($count, new ORM_Iterator(ORM::factory("item"), $db->query($query)));
+ return array($count, new ORM_Iterator(ORM::factory("item"), $data));
}
/**