mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 12:30:42 +02:00
Code Issues Releases Wiki Activity

[ticket/11745] Correct language, coding guidelines

Browse Source 
PHPBB3-11745
This commit is contained in:
Nathan Guse
2013-09-12 22:59:42 -05:00
parent 97204e432b
commit 32b9254740
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/common.php
View File

@@ -415,7 +415,7 @@ $lang = array_merge($lang, array(
), ),
'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', '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' => '%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_PM' => '%1$s sent you a Private Message "%2$s".',
'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".',
'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".',

6
phpBB/phpbb/notification/type/group_request.php
View File

@@ -38,7 +38,8 @@ class phpbb_notification_type_group_request extends phpbb_notification_type_base
public function is_available() public function is_available()
{ {
// Leader of any groups? // 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'] . ' WHERE user_id = ' . (int) $this->user->data['user_id'] . '
AND group_leader = 1'; AND group_leader = 1';
$result = $this->db->sql_query_limit($sql, 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(), 'ignore_users' => array(),
), $options); ), $options);
$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . ' $sql = 'SELECT user_id
FROM ' . USER_GROUP_TABLE . '
WHERE group_leader = 1 WHERE group_leader = 1
AND group_id = ' . (int) $group['group_id']; AND group_id = ' . (int) $group['group_id'];
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);