aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-01 12:59:56 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-01 12:59:56 +0100
commitbf820beb791d8a5c0c504c5e1b2704d56c5b78a1 (patch)
tree7ef26e62087c72c9cdfc0eb9d817b6ea126c993b /include
parentcde7a3f66cd8d48f0c7aea2391a2778fe494f884 (diff)
downloadvolse-hubzilla-bf820beb791d8a5c0c504c5e1b2704d56c5b78a1.tar.gz
volse-hubzilla-bf820beb791d8a5c0c504c5e1b2704d56c5b78a1.tar.bz2
volse-hubzilla-bf820beb791d8a5c0c504c5e1b2704d56c5b78a1.zip
remove experimental_app_bin config conditional
Diffstat (limited to 'include')
-rw-r--r--include/nav.php36
1 files changed, 17 insertions, 19 deletions
diff --git a/include/nav.php b/include/nav.php
index 25f2a1df4..1adc352a7 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -244,29 +244,27 @@ EOT;
//app bin
- $navapps = '';
- if(get_config('system','experimental_app_bin')) {
- if(local_channel()) {
- //Zlib\Apps::import_system_apps();
- $syslist = array();
- $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
- if($list) {
- foreach($list as $li) {
- $syslist[] = Zlib\Apps::app_encode($li);
- }
+ if(local_channel()) {
+ //Zlib\Apps::import_system_apps();
+ $syslist = array();
+ $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
+ if($list) {
+ foreach($list as $li) {
+ $syslist[] = Zlib\Apps::app_encode($li);
}
- Zlib\Apps::translate_system_apps($syslist);
- }
- else {
- $syslist = Zlib\Apps::get_system_apps(true);
}
-
- $navapps = replace_macros(get_markup_template('navapps.tpl'), array(
- '$apps' => $syslist,
- '$localuser' => local_channel(),
- ));
+ Zlib\Apps::translate_system_apps($syslist);
+ }
+ else {
+ $syslist = Zlib\Apps::get_system_apps(true);
}
+ $navapps = replace_macros(get_markup_template('navapps.tpl'), array(
+ '$apps' => $syslist,
+ '$localuser' => local_channel(),
+ ));
+
+
$tpl = get_markup_template('nav.tpl');
App::$page['nav'] .= replace_macros($tpl, array(