зеркало из https://github.com/nextcloud/server.git
Revert "enhance detection of un-initialized database", conflicted with setup step, needs rework
This reverts commit 7fb89c5386
.
This commit is contained in:
Родитель
7fb89c5386
Коммит
c3b57944ac
|
@ -582,12 +582,6 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
|
|||
return $query;
|
||||
}
|
||||
|
||||
/* Dummy interface for sqlite, to stay compatible with the database abstraction */
|
||||
function getUserInfo() {
|
||||
return "sqlite standard user";
|
||||
}
|
||||
|
||||
|
||||
// }}}
|
||||
// {{{ getServerVersion()
|
||||
|
||||
|
|
|
@ -97,14 +97,6 @@ class OC_DB {
|
|||
die( $error );
|
||||
}
|
||||
|
||||
self::$DBConnection->loadModule('Manager');
|
||||
if (count(self::$DBConnection->listTables()) == 0) {
|
||||
$error = 'database tables not initialized, using '.$CONFIG_DBTYPE.'. ('.self::$DBConnection->getUserInfo() . ')';
|
||||
if(defined("DEBUG") && DEBUG) {error_log( $error);}
|
||||
if(defined("DEBUG") && DEBUG) {error_log( self::$DBConnection->getUserInfo());}
|
||||
die( $error );
|
||||
}
|
||||
|
||||
// We always, really always want associative arrays
|
||||
self::$DBConnection->setFetchMode(MDB2_FETCHMODE_ASSOC);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче