harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preserve app categories when updating a system app

Browse Source
This commit is contained in:
redmatrix 2016-06-02 17:08:47 -07:00
parent 4a3ec65409
commit e596bf025b
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Zotlabs/Lib/Apps.php
View File

@ -60,12 +60,30 @@ class Apps {
if($apps) { if($apps) {
foreach($apps as $app) { foreach($apps as $app) {
if(self::check_install_system_app($app)) { $id = self::check_install_system_app($app);
$app['uid'] = local_channel(); // $id will be boolean true or false to install an app, or an integer id to update an existing app
$app['guid'] = hash('whirlpool',$app['name']); if($id === false)
$app['system'] = 1; continue;
self::app_install(local_channel(),$app); if($id !== true) {
} // if we already installed this app, but it changed, preserve any categories we created
$s = '';
$r = q("select * from term where otype = %d and oid = d",
intval(TERM_OBJ_APP),
intval($id)
);
if($r) {
foreach($r as $t) {
if($s)
$s .= ',';
$s .= $t['term'];
}
$app['categories'] = $s;
}
}
$app['uid'] = local_channel();
$app['guid'] = hash('whirlpool',$app['name']);
$app['system'] = 1;
self::app_install(local_channel(),$app);
} }
} }
} }
@ -84,7 +102,7 @@ class Apps {
if($iapp['app_id'] == hash('whirlpool',$app['name'])) { if($iapp['app_id'] == hash('whirlpool',$app['name'])) {
$notfound = false; $notfound = false;
if($iapp['app_version'] != $app['version']) { if($iapp['app_version'] != $app['version']) {
return true; return intval($iapp['app_id']);
} }
} }
} }