Merged better mssql check from stable

diff --git a/install.php b/install.php
index c2bc22eda0c279ada5ebe2bf3177a50d032e208d..0e14ecd9ff2c90aadf984fa8c1f24a2b442ec0a9 100644 (file)
--- a/install.php
+++ b/install.php
@@ -290,14 +290,14 @@ if ($INSTALL['stage'] == DATABASE) {
     }
 
     if ($INSTALL['dbtype'] == 'mssql') {  /// Check MSSQL extension is present
-        if (!extension_loaded('mssql')) {
+        if (!function_exists('mssql_connect')) {
             $errormsg = get_string('mssqlextensionisnotpresentinphp', 'install');
             $nextstage = DATABASE;
         }
     }
 
     if ($INSTALL['dbtype'] == 'mssql_n') {  /// Check MSSQL extension is present
-        if (!extension_loaded('mssql')) {
+        if (!function_exists('mssql_connect')) {
             $errormsg = get_string('mssqlextensionisnotpresentinphp', 'install');
             $nextstage = DATABASE;
         }