aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-09 18:47:59 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-09 18:47:59 +0200
commit026a1fc3ddb5ea5a0e9a0023f7d68603f917b87f (patch)
tree4198948349434324e688ea9c9eaca651cecdb241
parent04c084ead87e685508dde028785fa6362546e143 (diff)
parent59398020b65274ecf0db12ddda1d11ac1236715b (diff)
downloadforums-026a1fc3ddb5ea5a0e9a0023f7d68603f917b87f.tar
forums-026a1fc3ddb5ea5a0e9a0023f7d68603f917b87f.tar.gz
forums-026a1fc3ddb5ea5a0e9a0023f7d68603f917b87f.tar.bz2
forums-026a1fc3ddb5ea5a0e9a0023f7d68603f917b87f.tar.xz
forums-026a1fc3ddb5ea5a0e9a0023f7d68603f917b87f.zip
Merge branch 'develop-ascraeus' into develop
-rwxr-xr-xtravis/setup-php-extensions.sh6
1 files changed, 0 insertions, 6 deletions
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh
index 3655d6e952..c0defe44ef 100755
--- a/travis/setup-php-extensions.sh
+++ b/travis/setup-php-extensions.sh
@@ -42,12 +42,6 @@ function install_php_extension
php_ini_file=$(find_php_ini)
-# disable broken opcache on PHP 5.5.7 and 5.5.8
-if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.9', '<');"` == "1" ]
-then
- sed -i '/opcache.so/d' "$php_ini_file"
-fi
-
# apc
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ]
then