Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'w20_MDL-32967_m22_sqlsrvstrings' of git://github.com/sk…

…odak/moodle into MOODLE_22_STABLE
  • Loading branch information...
commit 1765044c643918d250eccc0fdd9acdc1e59a5d2e 2 parents 573e559 + 7c4f93c
@danpoltawski danpoltawski authored
View
2  lang/en/install.php
@@ -356,6 +356,8 @@
$string['nativesqlsrv'] = 'SQL*Server Microsoft (native/sqlsrv)';
$string['nativesqlsrvhelp'] = 'Now you need to configure the database where most Moodle data will be stored.
This database must already have been created and a username and password created to access it. Table prefix is mandatory.';
+$string['nativesqlsrvnodriver'] = 'Microsoft Drivers for SQL Server for PHP are not installed or not configured properly.';
+$string['nativesqlsrvnonwindows'] = 'Microsoft Drivers for SQL Server for PHP are available only for Windows OS.';
$string['sqliteextensionisnotpresentinphp'] = 'PHP has not been properly configured with the SQLite extension. Please check your php.ini file or recompile PHP.';
$string['upgradingqtypeplugin'] = 'Upgrading question/type plugin';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
View
6 lib/dml/sqlsrv_native_moodle_database.php
@@ -59,7 +59,11 @@ public function driver_installed() {
// the name used by 'extension_loaded()' is case specific! The extension
// therefore *could be* mixed case and hence not found.
if (!function_exists('sqlsrv_num_rows')) {
- return get_string('sqlsrvextensionisnotpresentinphp', 'install');
+ if (stripos(PHP_OS, 'win') === 0) {
+ return get_string('nativesqlsrvnodriver', 'install');
+ } else {
+ return get_string('nativesqlsrvnonwindows', 'install');
+ }
}
return true;
}
Please sign in to comment.
Something went wrong with that request. Please try again.