diff options
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 8aaefb02c5..b82be8887c 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -2015,7 +2015,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)) { diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 9802fab749..92c46f77f9 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -26,8 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] then # Upgrade to a recent stable version of HHVM - sudo apt-get -o Dpkg::Options::="--force-confnew" \ - install -y hhvm=3.0.0~precise + sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm # MySQLi is broken in HHVM 3.0.0~precise and still does not work for us in # 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now. |