diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-04 17:40:18 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-04 17:40:18 +0200 |
| commit | 9bfada03f3c9ee322d91a5c5e390b70afbf44016 (patch) | |
| tree | 496c839c3fcf6cc9d88f9ae5a5bae8f6123f3eab /phpBB/includes/acp/acp_users.php | |
| parent | 23455e92d027550e2e36dadd5b0096b0c3779dd9 (diff) | |
| parent | 67e049b7ff8fe75a14a0c84e25d97a426e857aa1 (diff) | |
| download | forums-9bfada03f3c9ee322d91a5c5e390b70afbf44016.tar forums-9bfada03f3c9ee322d91a5c5e390b70afbf44016.tar.gz forums-9bfada03f3c9ee322d91a5c5e390b70afbf44016.tar.bz2 forums-9bfada03f3c9ee322d91a5c5e390b70afbf44016.tar.xz forums-9bfada03f3c9ee322d91a5c5e390b70afbf44016.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12353] Fix displayed attachments in ACP
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 1f61010d62..59b6f49436 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -2072,7 +2072,7 @@ class acp_users WHERE a.poster_id = ' . $user_id . " AND a.is_orphan = 0 ORDER BY $order_by"; - $result = $db->sql_query_limit($sql, $config['posts_per_page'], $start); + $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); while ($row = $db->sql_fetchrow($result)) { |