aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-08-22 09:40:17 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-08-22 09:40:17 -0700
commit8dc4ca48d1ff5c3800637a463a7b072fb253634e (patch)
treeebd0052d95405b0c516f8988a7277566572a1003
parent16a13964d9b7f408ed0fb0f16f0025963420e26c (diff)
parent498fd1b54c7b8dbe02f87192c3c13baa2783b3bb (diff)
downloadelgg-8dc4ca48d1ff5c3800637a463a7b072fb253634e.tar.gz
elgg-8dc4ca48d1ff5c3800637a463a7b072fb253634e.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
-rw-r--r--engine/classes/ElggSite.php3
-rw-r--r--engine/lib/river.php2
-rw-r--r--mod/groups/lib/groups.php4
3 files changed, 5 insertions, 4 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index e3b8b8f1a..40bfca060 100644
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@ -410,8 +410,9 @@ class ElggSite extends ElggEntity {
'register',
'action/register',
'forgotpassword',
- 'action/user/requestnewpassword',
'resetpassword',
+ 'action/user/requestnewpassword',
+ 'action/user/passwordreset',
'upgrade\.php',
'xml-rpc\.php',
'mt/mt-xmlrpc\.cgi',
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 143ff035f..64ddcfdc1 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -472,7 +472,7 @@ function elgg_get_river_type_subtype_where_sql($table, $types, $subtypes, $pairs
}
if (is_array($wheres) && count($wheres)) {
- $wheres = array(implode(' AND ', $wheres));
+ $wheres = array(implode(' OR ', $wheres));
}
} else {
// using type/subtype pairs
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index 126738566..12a22deb4 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -424,9 +424,9 @@ function groups_register_profile_buttons($group) {
if ($group->canEdit()) {
// edit and invite
$url = elgg_get_site_url() . "groups/edit/{$group->getGUID()}";
- $actions[$url] = elgg_echo('groups:edit');
+ $actions[$url] = 'groups:edit';
$url = elgg_get_site_url() . "groups/invite/{$group->getGUID()}";
- $actions[$url] = elgg_echo('groups:invite');
+ $actions[$url] = 'groups:invite';
}
// group members