diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-04 21:26:52 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-04 21:26:52 -0400 |
| commit | 8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5 (patch) | |
| tree | ee9fc7e669c86c6c1ddf1ab9e5e0443d2b02a209 /Zotlabs/Module/Apps.php | |
| parent | e4a2aacd1d2f852264319aff848257349575131e (diff) | |
| parent | 8c9a773a90fc331f0b4d6ce44119abe1278fd8ea (diff) | |
| download | volse-hubzilla-8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5.tar.gz volse-hubzilla-8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5.tar.bz2 volse-hubzilla-8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'Zotlabs/Module/Apps.php')
| -rw-r--r-- | Zotlabs/Module/Apps.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 4066966ca..ea6ab1913 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -17,16 +17,21 @@ class Apps extends \Zotlabs\Web\Controller { $apps = array(); - $syslist = get_system_apps(); if(local_channel()) { + import_system_apps(); + $syslist = array(); $list = app_list(local_channel()); if($list) { foreach($list as $x) { $syslist[] = app_encode($x); } } + translate_system_apps($syslist); } + else + $syslist = get_system_apps(true); + usort($syslist,'app_name_compare'); // logger('apps: ' . print_r($syslist,true)); |