Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle

This commit is contained in:
David Monllao
2016-12-19 12:54:04 +01:00
2 changed files with 1 additions and 6 deletions
-1
View File
@@ -194,7 +194,6 @@ $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['ociextensionisnotpresentinphp'] = 'PHP has not been properly configured with the OCI8 extension so that it can communicate with Oracle. Please check your php.ini file or recompile PHP.';
$string['pass'] = 'Pass';
$string['paths'] = 'Paths';
+1 -5
View File
@@ -69,11 +69,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
// 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')) {
if (stripos(PHP_OS, 'win') === 0) {
return get_string('nativesqlsrvnodriver', 'install');
} else {
return get_string('nativesqlsrvnonwindows', 'install');
}
return get_string('nativesqlsrvnodriver', 'install');
}
return true;
}