diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 2 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 5e70ef97ec..da9236a82f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,5 +33,3 @@ matrix: env: DB=mariadb - php: 5.4 env: DB=postgres - allow_failures: - - php: hhvm diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index fb97255981..725cb4fdee 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -417,7 +417,7 @@ class install_convert extends module if (!isset($available_dbms[$src_dbms]) || !$available_dbms[$src_dbms]['AVAILABLE']) { - $error['db'][] = $lang['INST_ERR_NO_DB']; + $error[] = $lang['INST_ERR_NO_DB']; $connect_test = false; } else diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 92c46f77f9..6188d2c232 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -26,7 +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 + sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm-nightly # 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. |