Merge branch 'MDL-44377_26' of https://github.com/stronk7/moodle into MOODLE_26_STABLE

2014-03-03 15:15:20 +08:00
parent e6499fb8a4 36f74f56d8
commit 51214dd2d1
1 changed files with 5 additions and 0 deletions
@@ -130,6 +130,11 @@ class sqlsrv_native_moodle_database extends moodle_database {
     * @throws dml_connection_exception if error
     */
    public function connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, array $dboptions=null) {
+        if ($prefix == '' and !$this->external) {
+            // Enforce prefixes for everybody but mysql.
+            throw new dml_exception('prefixcannotbeempty', $this->get_dbfamily());
+        }
+
        $driverstatus = $this->driver_installed();

        if ($driverstatus !== true) {