From: moodler <moodler>
Date: Tue, 7 Nov 2006 12:39:56 +0000 (+0000)
Subject: Merged better mssql check from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5f8deafae6271c9bad791535ee310500f0ab049b;p=moodle.git

Merged better mssql check from stable
---

diff --git a/install.php b/install.php
index c2bc22eda0..0e14ecd9ff 100644
--- 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;
         }