aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_ban.php
diff options
context:
space:
mode:
authorJim Wigginton <terrafrost@phpbb.com>2009-09-02 05:12:23 +0000
committerJim Wigginton <terrafrost@phpbb.com>2009-09-02 05:12:23 +0000
commit73baf42558b70acf7b2e194a84172778374a1c6e (patch)
tree2095e4069ff2921d6a4aa9b30e7123c92ecdd6fc /phpBB/includes/acp/acp_ban.php
parent6134b641e395f1abd0a4fc71c50470ab93dea07e (diff)
downloadforums-73baf42558b70acf7b2e194a84172778374a1c6e.tar
forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.gz
forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.bz2
forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.xz
forums-73baf42558b70acf7b2e194a84172778374a1c6e.zip
Fixed bugs #43145, #44375, #44415 and #43045
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10088 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_ban.php')
-rw-r--r--phpBB/includes/acp/acp_ban.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 542ed47f3b..3198376584 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -156,7 +156,8 @@ class acp_ban
FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
- AND ban_ip <> ''";
+ AND ban_ip <> ''
+ ORDER BY ban_ip";
break;
case 'email':
@@ -168,7 +169,8 @@ class acp_ban
FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
- AND ban_email <> ''";
+ AND ban_email <> ''
+ ORDER BY ban_email";
break;
}
$result = $db->sql_query($sql);