diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-04-26 22:35:13 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-04-26 22:35:13 -0400 |
| commit | c182ab0e7b2739ff70fb18611af5e1baa02d81a2 (patch) | |
| tree | 68484f45c3ed603927829b028099ea3346799e04 /phpBB | |
| parent | efd9e331bce899d66a3e564bab78c5643fa6d94d (diff) | |
| parent | e7cb0f687df93120b003ad205fc6cb3315379c80 (diff) | |
| download | forums-c182ab0e7b2739ff70fb18611af5e1baa02d81a2.tar forums-c182ab0e7b2739ff70fb18611af5e1baa02d81a2.tar.gz forums-c182ab0e7b2739ff70fb18611af5e1baa02d81a2.tar.bz2 forums-c182ab0e7b2739ff70fb18611af5e1baa02d81a2.tar.xz forums-c182ab0e7b2739ff70fb18611af5e1baa02d81a2.zip | |
Merge PR #1371 branch 'EXreaction/ticket/11236' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11236:
[ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language
[ticket/11236] Do not require group selection in prune users
[ticket/11236] Correct HTML
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/prune.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 54ffe24594..4234ec1505 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -331,7 +331,7 @@ class acp_prune $s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>'; } - $s_group_list = ''; + $s_group_list = '<option value="0"></option>'; $sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . ' WHERE group_type <> ' . GROUP_SPECIAL . ' @@ -340,7 +340,7 @@ class acp_prune while ($row = $db->sql_fetchrow($result)) { - $s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</select>'; + $s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>'; } $db->sql_freeresult($result); diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php index fcc085205b..3e890182c0 100644 --- a/phpBB/language/en/acp/prune.php +++ b/phpBB/language/en/acp/prune.php @@ -51,7 +51,7 @@ $lang = array_merge($lang, array( 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.', 'POSTS_ON_QUEUE' => 'Posts Awaiting Approval', - 'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.', + 'PRUNE_USERS_GROUP_EXPLAIN' => 'Limit to users within the selected group.', 'PRUNE_USERS_LIST' => 'Users to be pruned', 'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.', 'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.', |