Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

This commit is contained in:
Weblate 2015-01-18 12:36:49 +01:00
commit cdf9a7ca3a
2 changed files with 5 additions and 0 deletions

View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.3.8.0 (not yet released)
- bug Undefined constant PMA_DRIZZLE
4.3.7.0 (2015-01-15)
- bug #4694 js error on marking table as favorite in Safari (in private mode)

View File

@ -2391,6 +2391,10 @@ class PMA_DatabaseInterface
*/
public function isSystemSchema($schema_name, $testForMysqlSchema = false)
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
return strtolower($schema_name) == 'information_schema'
|| (!PMA_DRIZZLE
&& strtolower($schema_name) == 'performance_schema')