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
SECURITY: update.php: Remove eval-stdin.php if necessary
[lhc/web/wiklou.git]
/
includes
/
installer
/
MssqlInstaller.php
diff --git
a/includes/installer/MssqlInstaller.php
b/includes/installer/MssqlInstaller.php
index
ba9818d
..
e462220
100644
(file)
--- a/
includes/installer/MssqlInstaller.php
+++ b/
includes/installer/MssqlInstaller.php
@@
-51,7
+51,8
@@
class MssqlInstaller extends DatabaseInstaller {
// SQL Server 2005 RTM
// @todo Are SQL Express version numbers different?)
// SQL Server 2005 RTM
// @todo Are SQL Express version numbers different?)
- public $minimumVersion = '9.00.1399';
+ public static $minimumVersion = '9.00.1399';
+ protected static $notMiniumumVerisonMessage = 'config-mssql-old';
// These are schema-level privs
// Note: the web user will be created will full permissions if possible, this permission
// These are schema-level privs
// Note: the web user will be created will full permissions if possible, this permission
@@
-191,12
+192,7
@@
class MssqlInstaller 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-mssql-old', $this->minimumVersion, $version );
- }
-
- return $status;
+ return static::meetsMinimumRequirement( $conn->getServerVersion() );
}
/**
}
/**
@@
-266,7
+262,7
@@
class MssqlInstaller extends DatabaseInstaller {
if ( !$status->isOK() ) {
return false;
}
if ( !$status->isOK() ) {
return false;
}
- /** @var
$conn Database
*/
+ /** @var
Database $conn
*/
$conn = $status->value;
// We need the server-level ALTER ANY LOGIN permission to create new accounts
$conn = $status->value;
// We need the server-level ALTER ANY LOGIN permission to create new accounts
@@
-577,7
+573,7
@@
class MssqlInstaller extends DatabaseInstaller {
$grantableNames[] = $dbUser;
} catch ( DBQueryError $dqe ) {
$this->db->rollback();
$grantableNames[] = $dbUser;
} catch ( DBQueryError $dqe ) {
$this->db->rollback();
- $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->get
Text
() );
+ $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->get
Message
() );
}
} elseif ( !$this->userExists( $dbUser ) ) {
try {
}
} elseif ( !$this->userExists( $dbUser ) ) {
try {
@@
-588,7
+584,7
@@
class MssqlInstaller extends DatabaseInstaller {
$grantableNames[] = $dbUser;
} catch ( DBQueryError $dqe ) {
$this->db->rollback();
$grantableNames[] = $dbUser;
} catch ( DBQueryError $dqe ) {
$this->db->rollback();
- $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->get
Text
() );
+ $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->get
Message
() );
}
} else {
$status->warning( 'config-install-user-alreadyexists', $dbUser );
}
} else {
$status->warning( 'config-install-user-alreadyexists', $dbUser );
@@
-620,7
+616,7
@@
class MssqlInstaller extends DatabaseInstaller {
$this->db->commit();
} catch ( DBQueryError $dqe ) {
$this->db->rollback();
$this->db->commit();
} catch ( DBQueryError $dqe ) {
$this->db->rollback();
- $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->get
Text
() );
+ $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->get
Message
() );
}
// Also try to grant SHOWPLAN on the db, but don't fail if we can't
// (just makes a couple things in mediawiki run slower since
}
// Also try to grant SHOWPLAN on the db, but don't fail if we can't
// (just makes a couple things in mediawiki run slower since
@@
-646,7
+642,7
@@
class MssqlInstaller extends DatabaseInstaller {
$this->db->query( "CREATE FULLTEXT INDEX ON $searchindex (si_title, si_text) "
. "KEY INDEX si_page ON $schema" );
} catch ( DBQueryError $dqe ) {
$this->db->query( "CREATE FULLTEXT INDEX ON $searchindex (si_title, si_text) "
. "KEY INDEX si_page ON $schema" );
} catch ( DBQueryError $dqe ) {
- $status->fatal( 'config-install-tables-failed', $dqe->get
Text
() );
+ $status->fatal( 'config-install-tables-failed', $dqe->get
Message
() );
}
}
}
}