diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-10-15 21:41:38 +0200 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-10-15 21:41:38 +0200 |
commit | 9c9f5ef2d6ca7912390b101fd993bc95b0b015b1 (patch) | |
tree | ebda817386cb183fe3ca7ab1bd87033d3d835981 /lib/db.php | |
parent | c721eefe8e108385d176fe6c61c59f8590ce3ac2 (diff) | |
parent | 9458a6c10e63829847c533a04b5c25ca646105a9 (diff) | |
download | nextcloud-server-9c9f5ef2d6ca7912390b101fd993bc95b0b015b1.tar.gz nextcloud-server-9c9f5ef2d6ca7912390b101fd993bc95b0b015b1.zip |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Diffstat (limited to 'lib/db.php')
-rw-r--r-- | lib/db.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/db.php b/lib/db.php index 1e0f5a1692f..6ad65201e1c 100644 --- a/lib/db.php +++ b/lib/db.php @@ -391,7 +391,7 @@ class OC_DB { * * TODO: write more documentation */ - public static function getDbStructure( $file ,$mode=MDB2_SCHEMA_DUMP_STRUCTURE) { + public static function getDbStructure( $file, $mode=MDB2_SCHEMA_DUMP_STRUCTURE) { self::connectScheme(); // write the scheme @@ -476,7 +476,7 @@ class OC_DB { public static function updateDbFromStructure($file) { $CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" ); $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); - + self::connectScheme(); // read file @@ -732,7 +732,7 @@ class OC_DB { return false; } } - + /** * returns the error code and message as a string for logging * works with MDB2 and PDOException |