sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Keep the data of the local app (especially the version) 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/10508/head
Joas Schilling 2018-08-02 13:47:42 +07:00
parent 9891eae232
commit 2dcae4e8ea
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings/Controller/AppSettingsController.php
Unescape Escape View File

@ -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']]);
}
}