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

… MOODLE_25_STABLE
moodle · Mar 3, 2014 · 1249c06 · 1249c06
2 parents fa07779 + 0490407
commit 1249c06
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
@@ -145,6 +145,11 @@ public function get_configuration_hints() {
      * @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) {