aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-19 18:26:38 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-19 18:26:38 +0000
commitf9271180b1e82fdf746d315b241efb3ebabd8f35 (patch)
treefc5dd554d4c47c126c5231a36fd4cff72964017d /mod
parent2c27964706285c91845dbc3f116e58dac32c3913 (diff)
downloadelgg-f9271180b1e82fdf746d315b241efb3ebabd8f35.tar.gz
elgg-f9271180b1e82fdf746d315b241efb3ebabd8f35.tar.bz2
Merged previous to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5803 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/search/index.php4
-rw-r--r--mod/search/search_hooks.php7
2 files changed, 10 insertions, 1 deletions
diff --git a/mod/search/index.php b/mod/search/index.php
index 8ee44d9e7..2a6b2ce62 100644
--- a/mod/search/index.php
+++ b/mod/search/index.php
@@ -8,7 +8,7 @@
* @link http://elgg.org/
*/
-// Search supports RSS
+// Search supports RSS
global $autofeed;
$autofeed = true;
@@ -27,6 +27,7 @@ $offset = ($search_type == 'all') ? 0 : get_input('offset', 0);
$entity_type = get_input('entity_type', ELGG_ENTITIES_ANY_VALUE);
$entity_subtype = get_input('entity_subtype', ELGG_ENTITIES_ANY_VALUE);
$owner_guid = get_input('owner_guid', ELGG_ENTITIES_ANY_VALUE);
+$container_guid = get_input('container_guid', ELGG_ENTITIES_ANY_VALUE);
$friends = get_input('friends', ELGG_ENTITIES_ANY_VALUE);
$sort = get_input('sort');
switch ($sort) {
@@ -59,6 +60,7 @@ $params = array(
'subtype' => $entity_subtype,
// 'tag_type' => $tag_type,
'owner_guid' => $owner_guid,
+ 'container_guid' => $container_guid,
// 'friends' => $friends
'pagination' => ($search_type == 'all') ? FALSE : TRUE
);
diff --git a/mod/search/search_hooks.php b/mod/search/search_hooks.php
index a2063dbc1..86a6b452f 100644
--- a/mod/search/search_hooks.php
+++ b/mod/search/search_hooks.php
@@ -324,6 +324,11 @@ function search_comments_hook($hook, $type, $value, $params) {
// available on metastrings (and boolean mode doesn't need it)
$search_where = search_get_where_sql('msv', $fields, $params, FALSE);
+ $container_and = '';
+ if ($params['container_guid'] && $params['container_guid'] !== ELGG_ENTITIES_ANY_VALUE) {
+ $container_and = 'AND e.container_guid = ' . sanitise_string($params['container_guid']);
+ }
+
$e_access = get_access_sql_suffix('e');
$a_access = get_access_sql_suffix('a');
// @todo this can probably be done through the api..
@@ -335,6 +340,7 @@ function search_comments_hook($hook, $type, $value, $params) {
AND ($search_where)
AND $e_access
AND $a_access
+ $container_and
LIMIT {$params['offset']}, {$params['limit']}
";
@@ -349,6 +355,7 @@ function search_comments_hook($hook, $type, $value, $params) {
AND ($search_where)
AND $e_access
AND $a_access
+ $container_and
";
$result = get_data($q);