gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-11-03 18:44:10 -08:00
commit 0fc18eef29
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -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 ;

2
libraries/operations.lib.php
View File

@ -157,7 +157,7 @@ function PMA_getHtmlForCopyDatabase($db)
$html_output = '<div class="operations_half_width clearfloat">';
$html_output .= '<form id="copy_db_form" '
. 'class="ajax" '
. 'method="post" action="db_operations.php"'
. 'method="post" action="db_operations.php" '
. 'onsubmit="return emptyFormElements(this, \'newname\')">';
if (isset($_REQUEST['db_collation'])) {

14
po/en_GB.po
View File

@ -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 <robert_readman@hotmail.com>\n"
"Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/"
"phpmyadmin/master/en_GB/>\n"
"PO-Revision-Date: 2014-11-03 09:49+0200\n"
"Last-Translator: Dreezerd <dries.verschuere@outlook.com>\n"
"Language-Team: English (United Kingdom) "
"<https://hosted.weblate.org/projects/phpmyadmin/master/en_GB/>\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

3
test/bootstrap-dist.php
View File

@ -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"))