aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-09 15:22:21 -0700
committerfriendica <info@friendica.com>2014-10-09 15:22:21 -0700
commit1adb7a2eefd55b95644997f87a64608f69672cab (patch)
tree95405b347367a99623eee6588f8adebeeca1a79a
parent6b48672343264da63013be873b025eb0ea9735c2 (diff)
downloadvolse-hubzilla-1adb7a2eefd55b95644997f87a64608f69672cab.tar.gz
volse-hubzilla-1adb7a2eefd55b95644997f87a64608f69672cab.tar.bz2
volse-hubzilla-1adb7a2eefd55b95644997f87a64608f69672cab.zip
allow a site to over-ride the system app list without causing git issues
-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);