diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-07-25 16:57:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 16:57:13 +0200 |
| commit | 68c4fc25069b580062752a6f55e47d91be57efae (patch) | |
| tree | 0f18f14cfbc555e3e6d4ae38188ce40024a78b12 /lib/private/DB | |
| parent | 8d751ff2b429380af7e5c870844a6a32f82f0741 (diff) | |
| parent | d254797f561b0f7a2f3feeaa8bb868ad2d3c74be (diff) | |
| download | nextcloud-server-68c4fc25069b580062752a6f55e47d91be57efae.tar.gz nextcloud-server-68c4fc25069b580062752a6f55e47d91be57efae.zip | |
Merge pull request #5772 from nextcloud/migrations-install
Install nextcloud via migrations instead of the db_structure.xml
Diffstat (limited to 'lib/private/DB')
| -rw-r--r-- | lib/private/DB/MigrationService.php | 6 | ||||
| -rw-r--r-- | lib/private/DB/SchemaWrapper.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 92041b5e324..45f6aee83f6 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -284,7 +284,8 @@ class MigrationService { case 'latest': $this->ensureMigrationsAreLoaded(); - return @end($this->getAvailableVersions()); + $migrations = $this->getAvailableVersions(); + return @end($migrations); } return '0'; } @@ -316,7 +317,8 @@ class MigrationService { if (count($m) === 0) { return '0'; } - return @end(array_values($m)); + $migrations = array_values($m); + return @end($migrations); } /** diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php index 0be45d8d3f7..d686d7e63e5 100644 --- a/lib/private/DB/SchemaWrapper.php +++ b/lib/private/DB/SchemaWrapper.php @@ -34,7 +34,7 @@ class SchemaWrapper { protected $schema; /** @var array */ - protected $tablesToDelete; + protected $tablesToDelete = []; /** * @param IDBConnection $connection |