webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-23 18:29:15 +03:00
Code Activity

Merge branch 'QA_4_9' into QA_5_0

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes
2019-12-21 23:37:51 +01:00
parent 527d1af4c5 823aad9ad6
commit efbf84bdb1
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -159,6 +159,7 @@ jobs:
- stage: "Documentation"
name: "Build API docs"
before_install: phpenv config-rm xdebug.ini
before_script: skip
after_script: skip
after_success: skip
@@ -182,6 +183,7 @@ jobs:
- TESTSUITE_SELENIUM_BROWSER=chrome
- TESTSUITE_USER=root
- TESTSUITE_URL=http://127.0.0.1:8000
before_install: phpenv config-rm xdebug.ini
install:
- ./test/install-browserstack
- composer install --no-interaction

3
libraries/classes/Charsets.php
View File

@@ -155,6 +155,9 @@ class Charsets
}
self::loadCharsets($dbi, $disableIs);
$serverCharset = $dbi->getVariable('character_set_server');
if (! is_string($serverCharset)) {// MySQL 5.7.8 fallback, issue #15614
$serverCharset = $dbi->fetchValue("SELECT @@character_set_server;");
}
self::$serverCharset = self::$charsets[$serverCharset];
return self::$serverCharset;
}