diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-03 21:50:34 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-03 21:50:34 -0400 |
| commit | e4a2aacd1d2f852264319aff848257349575131e (patch) | |
| tree | a0d25ece0130fce219cc4df6950f7ab5d41b5c7b /include | |
| parent | 5686ee13b4540bfc0ce6c40f07b6e43c3c55e9a8 (diff) | |
| parent | 45c7a03a0d3e534ee121a632fc279c353015b876 (diff) | |
| download | volse-hubzilla-e4a2aacd1d2f852264319aff848257349575131e.tar.gz volse-hubzilla-e4a2aacd1d2f852264319aff848257349575131e.tar.bz2 volse-hubzilla-e4a2aacd1d2f852264319aff848257349575131e.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'include')
| -rw-r--r-- | include/apps.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/apps.php b/include/apps.php index fac58b850..dca49a3c6 100644 --- a/include/apps.php +++ b/include/apps.php @@ -316,8 +316,13 @@ function app_installed($uid,$app) { } -function app_list($uid) { - $r = q("select * from app where app_channel = %d order by app_name asc", +function app_list($uid, $deleted = false) { + if($deleted) + $sql_extra = " and app_deleted = 1 "; + else + $sql_extra = " and app_deleted = 0 "; + + $r = q("select * from app where app_channel = %d $sql_extra order by app_name asc", intval($uid) ); if($r) { |