diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-25 11:21:24 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-25 11:21:24 +0200 |
| commit | c98776923a3aed4a0a17ca1412787de3b718eba9 (patch) | |
| tree | e0057208e1a1f039b556d9aa47d7c72fe5ab0786 /Zotlabs/Lib/Apps.php | |
| parent | 9f9b9dfd82fa518961b11387e3a6c3e048280acc (diff) | |
| parent | bb4f9eecbe88c5d6ead654cefefcd3c57f23c1fe (diff) | |
| download | volse-hubzilla-c98776923a3aed4a0a17ca1412787de3b718eba9.tar.gz volse-hubzilla-c98776923a3aed4a0a17ca1412787de3b718eba9.tar.bz2 volse-hubzilla-c98776923a3aed4a0a17ca1412787de3b718eba9.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Lib/Apps.php')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index f91dc8e49..24cb4a626 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -785,6 +785,7 @@ class Apps { dbesc($darray['app_plugin']), intval($darray['app_deleted']) ); + if($r) { $ret['success'] = true; $ret['app_id'] = $darray['app_id']; @@ -871,6 +872,12 @@ class Apps { dbesc($darray['app_id']), intval($darray['app_channel']) ); + + // if updating an embed app, don't mess with any existing categories. + + if(array_key_exists('embed',$arr) && intval($arr['embed'])) + return $ret; + if($x) { q("delete from term where otype = %d and oid = %d", intval(TERM_OBJ_APP), |