diff --git a/.travis.yml b/.travis.yml index dfabfc5937..89196cfb70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,12 @@ before_script: if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then - if [[ $TRAVIS_PHP_VERSION != "5.6" ]] ; then git clone --depth=1 git://github.com/zenovich/runkit.git ; cd runkit ; + if [[ $TRAVIS_PHP_VERSION = "5.6" ]] ; then + wget https://github.com/zenovich/runkit/pull/71.diff ; + patch -p1 < 71.diff ; + fi ; phpize ; ./configure ; make ; @@ -38,7 +41,6 @@ before_script: cd .. ; phpenv config-add test/travis.php.ini ; - fi wget https://scrutinizer-ci.com/ocular.phar ; diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 00335d648f..2e58b33b22 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -157,7 +157,7 @@ function PMA_getHtmlForCopyDatabase($db) $html_output = '