diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-02 14:24:38 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-02 14:24:38 -0700 |
| commit | de175a4b0f0971c9cbbf912bbc3fd8cbc190b53d (patch) | |
| tree | a00d71fbb76d14c3449576707874c492f7255af0 | |
| parent | f8093699f70813f72954725e3cfa69510b7f7e2a (diff) | |
| parent | 78c60c25c86e9e00d603e29113fae3eb2f8d1bc7 (diff) | |
| download | nextcloud-server-de175a4b0f0971c9cbbf912bbc3fd8cbc190b53d.tar.gz nextcloud-server-de175a4b0f0971c9cbbf912bbc3fd8cbc190b53d.zip | |
Merge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-table-master
only perform files upgrade in case there are actually entries in the old...
| -rw-r--r-- | lib/private/files/cache/upgrade.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/files/cache/upgrade.php b/lib/private/files/cache/upgrade.php index cfb9a117311..e3a46896cbf 100644 --- a/lib/private/files/cache/upgrade.php +++ b/lib/private/files/cache/upgrade.php @@ -192,7 +192,15 @@ class Upgrade { */ static function needUpgrade($user) { $cacheVersion = (int)\OCP\Config::getUserValue($user, 'files', 'cache_version', 4); - return $cacheVersion < 5; + if ($cacheVersion < 5) { + $legacy = new \OC\Files\Cache\Legacy($user); + if ($legacy->hasItems()) { + return true; + } + self::upgradeDone($user); + } + + return false; } /** |