diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-04-17 11:59:15 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-04-17 11:59:15 +0200 |
| commit | ab155de14fbc046d78b4eeaac0e8350c4b38dc98 (patch) | |
| tree | 16af794163a6d8dbe154e68295dca9a7c7560c49 /3dparty/MDB2 | |
| parent | fda445ab0536b06f8bb37b58413a25d97f4036a5 (diff) | |
| download | nextcloud-server-ab155de14fbc046d78b4eeaac0e8350c4b38dc98.tar.gz nextcloud-server-ab155de14fbc046d78b4eeaac0e8350c4b38dc98.zip | |
improve error handeling for first run dialog
Diffstat (limited to '3dparty/MDB2')
| -rw-r--r-- | 3dparty/MDB2/Schema.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/3dparty/MDB2/Schema.php b/3dparty/MDB2/Schema.php index a25a6254403..25818460a62 100644 --- a/3dparty/MDB2/Schema.php +++ b/3dparty/MDB2/Schema.php @@ -1338,15 +1338,15 @@ class MDB2_Schema extends PEAR if ($dbExists) { $this->db->debug('Database already exists: ' . $db_name, __FUNCTION__); - if (!empty($dbOptions)) { - $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NO_PERMISSION); - $this->db->expectError($errorcodes); - $result = $this->db->manager->alterDatabase($db_name, $dbOptions); - $this->db->popExpect(); - if (PEAR::isError($result) && !MDB2::isError($result, $errorcodes)) { - return $result; - } - } +// if (!empty($dbOptions)) { +// $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NO_PERMISSION); +// $this->db->expectError($errorcodes); +// $result = $this->db->manager->alterDatabase($db_name, $dbOptions); +// $this->db->popExpect(); +// if (PEAR::isError($result) && !MDB2::isError($result, $errorcodes)) { +// return $result; +// } +// } $create = false; } else { $this->db->expectError(MDB2_ERROR_UNSUPPORTED); |