dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
installer: Add support for PlatformSettings.php
[lhc/web/wiklou.git]
/
includes
/
installer
/
MysqlInstaller.php
diff --git
a/includes/installer/MysqlInstaller.php
b/includes/installer/MysqlInstaller.php
index
c5dd4dc
..
6256204
100644
(file)
--- a/
includes/installer/MysqlInstaller.php
+++ b/
includes/installer/MysqlInstaller.php
@@
-51,7
+51,8
@@
class MysqlInstaller extends DatabaseInstaller {
public $supportedEngines = [ 'InnoDB', 'MyISAM' ];
public $supportedEngines = [ 'InnoDB', 'MyISAM' ];
- public $minimumVersion = '5.5.8';
+ public static $minimumVersion = '5.5.8';
+ protected static $notMiniumumVerisonMessage = 'config-mysql-old';
public $webUserPrivs = [
'DELETE',
public $webUserPrivs = [
'DELETE',
@@
-72,7
+73,7
@@
class MysqlInstaller extends DatabaseInstaller {
* @return bool
*/
public function isCompiled() {
* @return bool
*/
public function isCompiled() {
- return self::checkExtension( 'mysql
' ) || self::checkExtension( 'mysql
i' );
+ return self::checkExtension( 'mysqli' );
}
/**
}
/**
@@
-133,12
+134,7
@@
class MysqlInstaller extends DatabaseInstaller {
$conn = $status->value;
// Check version
$conn = $status->value;
// Check version
- $version = $conn->getServerVersion();
- if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
- return Status::newFatal( 'config-mysql-old', $this->minimumVersion, $version );
- }
-
- return $status;
+ return static::meetsMinimumRequirement( $conn->getServerVersion() );
}
/**
}
/**