diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-08-02 13:47:42 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-08-02 13:47:42 +0200 |
| commit | 2dcae4e8ea4d065a9d84b57f44add3c27d54706e (patch) | |
| tree | ae2a6ce2dd60a6acc7003425416887568d485c92 /settings/Controller | |
| parent | 9891eae232d77391699d3be908ed03426779d4d2 (diff) | |
| download | nextcloud-server-2dcae4e8ea4d065a9d84b57f44add3c27d54706e.tar.gz nextcloud-server-2dcae4e8ea4d065a9d84b57f44add3c27d54706e.zip | |
Keep the data of the local app (especially the version)
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'settings/Controller')
| -rw-r--r-- | settings/Controller/AppSettingsController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index 5930bc700d4..f2ea784595f 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -214,7 +214,7 @@ class AppSettingsController extends Controller { if (!array_key_exists($app['id'], $this->allApps)) { $this->allApps[$app['id']] = $app; } else { - $this->allApps[$app['id']] = array_merge($this->allApps[$app['id']], $app); + $this->allApps[$app['id']] = array_merge($app, $this->allApps[$app['id']]); } } |