diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:36 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:36 +0200 |
| commit | e97fab49e2ce73a8cc179a934ed8c0a05057bda3 (patch) | |
| tree | ef1a9f196e258b2a1297b84b59583fdab65d59d7 /phpBB/includes/acp/acp_users.php | |
| parent | 4558262e2aaf31b4583a87622e97a46ead11537c (diff) | |
| parent | 53ff23671c2706c13bbe8ecca6b29b3c3456768b (diff) | |
| download | forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.gz forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.bz2 forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.xz forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2e5eec7e33..351e8ed49b 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -2379,7 +2379,7 @@ class acp_users // Select auth options $sql = 'SELECT auth_option, is_local, is_global FROM ' . ACL_OPTIONS_TABLE . ' - WHERE auth_option ' . $db->sql_like_expression($db->any_char . '_') . ' + WHERE auth_option ' . $db->sql_like_expression($db->get_any_char() . '_') . ' AND is_global = 1 ORDER BY auth_option'; $result = $db->sql_query($sql); @@ -2399,7 +2399,7 @@ class acp_users { $sql = 'SELECT auth_option, is_local, is_global FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option " . $db->sql_like_expression($db->any_char . '_') . " + WHERE auth_option " . $db->sql_like_expression($db->get_any_char() . '_') . " AND is_local = 1 ORDER BY is_global DESC, auth_option"; $result = $db->sql_query($sql); |