mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

Browse Source 
Conflicts:
	phpBB/docs/hook_system.html
This commit is contained in:
Yuriy Rusko
2014-05-27 21:55:40 +02:00
parent 27f787e5e4 0acaa77229
commit 1d61bcedfd
39 changed files with 507 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
travis/setup-webserver.sh
View File

@@ -33,10 +33,6 @@ then
# Upgrade to a recent stable version of 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.
sed -i "s/mysqli/mysql/" "$DIR/phpunit-mysql-travis.xml"
HHVM_LOG=$(realpath "$DIR")/hhvm.log
sudo hhvm \