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 = '
'; $html_output .= '
'; if (isset($_REQUEST['db_collation'])) { diff --git a/po/en_GB.po b/po/en_GB.po index 1fc7283d5b..75a2f92117 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-10-16 12:25-0400\n" -"PO-Revision-Date: 2014-10-01 06:13+0200\n" -"Last-Translator: Robert Readman \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2014-11-03 09:49+0200\n" +"Last-Translator: Dreezerd \n" +"Language-Team: English (United Kingdom) " +"\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -28,7 +28,7 @@ msgstr "" #: db_central_columns.php:85 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "The central list of columns for the current database is empty." #: db_central_columns.php:109 #, fuzzy diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index ad15752d40..209a05ed6f 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -9,6 +9,9 @@ // Let PHP complain about all errors error_reporting(E_ALL); +// Ensure PHP has set timezone +date_default_timezone_set('UTC'); + // Adding phpMyAdmin sources to include path set_include_path( get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php"))