diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 20:47:29 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 20:47:29 -0700 |
| commit | 328ed8bb1b5f73626a032091a78609aea312f5ae (patch) | |
| tree | 1cb3dc14a29e42ce31ef9c4733b085dd7d410181 /include/apps.php | |
| parent | 1b0b847fc80827022c513a74a7fa817c7d640da0 (diff) | |
| parent | c78227292709f8f36206c7234dbf3548e476d442 (diff) | |
| download | volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.tar.gz volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.tar.bz2 volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/apps.php')
| -rw-r--r-- | include/apps.php | 5 |
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); |