aboutsummaryrefslogtreecommitdiffstats
path: root/include/apps.php
diff options
context:
space:
mode:
authorJeroen <jeroenpraat@xs4all.nl>2014-10-10 13:37:09 +0000
committerJeroen <jeroenpraat@xs4all.nl>2014-10-10 13:37:09 +0000
commit053e6061089ba89a53caf264ea4a055cec8be8ba (patch)
tree0323006e1fdf262026fd6198c51c69f05ce6d54b /include/apps.php
parent1dda77596926fe08990c8a6f31412a38fbc602b5 (diff)
parentf2335448f44e270222dad9147bd2b2c4bfec950b (diff)
downloadvolse-hubzilla-053e6061089ba89a53caf264ea4a055cec8be8ba.tar.gz
volse-hubzilla-053e6061089ba89a53caf264ea4a055cec8be8ba.tar.bz2
volse-hubzilla-053e6061089ba89a53caf264ea4a055cec8be8ba.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/apps.php')
-rw-r--r--include/apps.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/apps.php b/include/apps.php
index 91012b0ef..cd0c2984e 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -11,7 +11,10 @@ require_once('include/identity.php');
function get_system_apps() {
$ret = array();
- $files = glob('app/*.apd');
+ if(is_dir('apps'))
+ $files = glob('apps/*.apd');
+ else
+ $files = glob('app/*.apd');
if($files) {
foreach($files as $f) {
$x = parse_app_description($f);