MDL-17057 dml: fixed regression changed by removed dbpersist parameter - sorrrry

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index a4c81aa7c2b296828ea3d335da936bc3e4251792..2a819321c87998b4766ff401f11f890e3c466092 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -464,12 +464,12 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     if (empty($errormsg)) {
         error_reporting(0);  // Hide errors
 
-        if (! $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], false, $INSTALL['prefix'])) {
+        if (! $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], $INSTALL['prefix'])) {
             if (!$DB->create_database($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'])) {
                  $errormsg = get_string('dbcreationerror', 'install');
                  $nextstage = DATABASE;
             } else {
-                $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], false, $INSTALL['prefix']);
+                $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], $INSTALL['prefix']);
             }
         } else {
 // TODO: db encoding checks ??

diff --git a/admin/dbtransfer/index.php b/admin/dbtransfer/index.php
index cb25530dbebfbd7969bf113aeba956fde58c09e8..66bc1d8fae11ba294958eff91cd59510c22cddb2 100644 (file)
--- a/admin/dbtransfer/index.php
+++ b/admin/dbtransfer/index.php
@@ -13,7 +13,7 @@ $form = new database_transfer_form();
 if ($data = $form->get_data()) {
     list($dbtype, $dblibrary) = explode('/', $data->driver);
     $targetdb = moodle_database::get_driver_instance($dbtype, $dblibrary);
-    if (!$targetdb->connect($data->dbhost, $data->dbuser, $data->dbpass, $data->dbname, false, $data->prefix, null)) {
+    if (!$targetdb->connect($data->dbhost, $data->dbuser, $data->dbpass, $data->dbname, $data->prefix, null)) {
         throw new dbtransfer_exception('notargetconectexception', null, "$CFG->wwwroot/$CFG->admin/dbtransfer/");
     }
     if ($targetdb->get_tables()) {

diff --git a/admin/generator.php b/admin/generator.php
index b5aa0185162fc32a694127b3f7a08ed91887ae48..68a55b6b44baf894cd9112e7ec3999c7cfa4d478 100755 (executable)
--- a/admin/generator.php
+++ b/admin/generator.php
@@ -162,7 +162,7 @@ class generator {
 
         $class = get_class($DB);
         $DB = new $class();
-        $DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, true, $this->get('database_prefix'));
+        $DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $this->get('database_prefix'));
     }
 
     public function generate_users() {

diff --git a/install.php b/install.php
index 60e5a30c2f950e63cf0c7242cc38618e13ec4b61..8558dcbe38540eddfad6c35d3fe0934465733195 100644 (file)
--- a/install.php
+++ b/install.php
@@ -324,12 +324,12 @@ if ($INSTALL['stage'] == DATABASE) {
     if (empty($errormsg)) {
         error_reporting(0);  // Hide errors
 
-        if (! $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], false, $INSTALL['prefix'])) {
+        if (! $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], $INSTALL['prefix'])) {
             if (!$DB->create_database($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'])) {
                  $errormsg = get_string('dbcreationerror', 'install');
                  $nextstage = DATABASE;
             } else {
-                $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], false, $INSTALL['prefix']);
+                $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], $INSTALL['prefix']);
             }
         } else {
 // TODO: db encoding checks ??
@@ -376,7 +376,7 @@ if ($INSTALL['stage'] == ENVIRONMENT) {
     $DB = $databases[$INSTALL['dbtype']];
 
     error_reporting(0);  // Hide errors
-    $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], false, $INSTALL['prefix']);
+    $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], $INSTALL['prefix']);
     error_reporting(38911);  // Show errors
     if ($dbconnected) {
     /// Execute environment check, printing results
@@ -789,7 +789,7 @@ function form_table($nextstage, $formaction, $databases) {
                 <td colspan="2">
                 <?php
                     error_reporting(0);  // Hide errors
-                    $dbconnected = $DB->connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'], false, $INSTALL['prefix']);
+                    $dbconnected = $DB->connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'], $INSTALL['prefix']);
                     error_reporting(38911);  // Show errors
                     if ($dbconnected) {
                     /// Execute environment check, printing results