Merge branch 'w16_MDL-45070_m27_ubuntumaria' of https://github.com/skodak/moodle

This commit is contained in:
Damyon Wiese
2014-04-15 14:46:40 +08:00
+1 -1
View File
@@ -81,7 +81,7 @@ class mariadb_native_moodle_database extends mysqli_native_moodle_database {
public function get_server_info() {
$version = $this->mysqli->server_info;
$matches = null;
if (preg_match('/^5\.5\.5-(10\..+)-MariaDB$/i', $version, $matches)) {
if (preg_match('/^5\.5\.5-(10\..+)-MariaDB/i', $version, $matches)) {
// Looks like MariaDB decided to use these weird version numbers for better BC with MySQL...
$version = $matches[1];
}