diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-06 16:40:11 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-06 16:40:11 +0200 |
| commit | 647dcce514a22636d83e7de76dd0dfde82098fa6 (patch) | |
| tree | 15d7efc8ed023b7019a425a21b1a13a8cbd3152e /lib/private | |
| parent | c053f2738162ae50da886833004bf39aed8387a5 (diff) | |
| parent | fe8bae31dc80ac832323fa8d9a75fd4b543d36e0 (diff) | |
| download | nextcloud-server-647dcce514a22636d83e7de76dd0dfde82098fa6.tar.gz nextcloud-server-647dcce514a22636d83e7de76dd0dfde82098fa6.zip | |
Merge pull request #8253 from owncloud/pk-on-all-tables-master
Primary keys on all tables master
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/db/mdb2schemamanager.php | 2 | ||||
| -rw-r--r-- | lib/private/updater.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index 734ba18d1ac..ee3d53b576a 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -109,7 +109,7 @@ class MDB2SchemaManager { */ public function simulateUpdateDbFromStructure($file) { $toSchema = $this->readSchemaFromFile($file); - $migrator = $this->getMigrator()->checkMigrate($toSchema); + $this->getMigrator()->checkMigrate($toSchema); return true; } diff --git a/lib/private/updater.php b/lib/private/updater.php index 58a4086c80f..9cc1b3322eb 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -150,6 +150,7 @@ class Updater extends BasicEmitter { // This is added to prevent host header poisoning \OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost()))); } + /* * STOP CONFIG CHANGES FOR OLDER VERSIONS */ |