aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/phpbb/notification/type/group_request.php6
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 91b1f6d9d9..bd34c51bef 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -415,7 +415,7 @@ $lang = array_merge($lang, array(
),
'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.',
'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.',
- 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the "%1$s" group on has been approved.',
+ 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.',
'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".',
'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".',
'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".',
diff --git a/phpBB/phpbb/notification/type/group_request.php b/phpBB/phpbb/notification/type/group_request.php
index 96015783fb..f3918f381d 100644
--- a/phpBB/phpbb/notification/type/group_request.php
+++ b/phpBB/phpbb/notification/type/group_request.php
@@ -38,7 +38,8 @@ class phpbb_notification_type_group_request extends phpbb_notification_type_base
public function is_available()
{
// Leader of any groups?
- $sql = 'SELECT group_id FROM ' . USER_GROUP_TABLE . '
+ $sql = 'SELECT group_id
+ FROM ' . USER_GROUP_TABLE . '
WHERE user_id = ' . (int) $this->user->data['user_id'] . '
AND group_leader = 1';
$result = $this->db->sql_query_limit($sql, 1);
@@ -74,7 +75,8 @@ class phpbb_notification_type_group_request extends phpbb_notification_type_base
'ignore_users' => array(),
), $options);
- $sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . '
+ $sql = 'SELECT user_id
+ FROM ' . USER_GROUP_TABLE . '
WHERE group_leader = 1
AND group_id = ' . (int) $group['group_id'];
$result = $this->db->sql_query($sql);