aboutsummaryrefslogtreecommitdiffstats
path: root/include/nav.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-09-20 18:36:14 -0700
committerzotlabs <mike@macgirvin.com>2018-09-20 18:36:14 -0700
commita4d987b45a841acaf9b825ecf466072b09a8c254 (patch)
tree15d281573f28c0f62b48b3e1355add4ff2178d26 /include/nav.php
parent3cc66b68162a82493cd68d369e4f0cbb01f941d0 (diff)
parent369f34b2d122c7bd22522101fc9e4ce0f597a04e (diff)
downloadvolse-hubzilla-a4d987b45a841acaf9b825ecf466072b09a8c254.tar.gz
volse-hubzilla-a4d987b45a841acaf9b825ecf466072b09a8c254.tar.bz2
volse-hubzilla-a4d987b45a841acaf9b825ecf466072b09a8c254.zip
Merge branch 'dev'
Diffstat (limited to 'include/nav.php')
-rw-r--r--include/nav.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/include/nav.php b/include/nav.php
index 9afba7945..5a2096e02 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -199,14 +199,25 @@ function nav($template = 'default') {
// turned off until somebody discovers this and figures out a good location for it.
$powered_by = '';
+ $url = '';
+ $settings_url = '';
+
if(App::$profile_uid && App::$nav_sel['raw_name']) {
$active_app = q("SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1",
intval(App::$profile_uid),
dbesc(App::$nav_sel['raw_name'])
);
-
+
if($active_app) {
- $url = $active_app[0]['app_url'];
+ if(strpos($active_app[0]['app_url'], ',')) {
+ $urls = explode(',', $active_app[0]['app_url']);
+ $url = trim($urls[0]);
+ if($is_owner)
+ $settings_url = trim($urls[1]);
+ }
+ else {
+ $url = $active_app[0]['app_url'];
+ }
}
}
@@ -289,7 +300,8 @@ function nav($template = 'default') {
'$addapps' => t('Add Apps'),
'$orderapps' => t('Arrange Apps'),
'$sysapps_toggle' => t('Toggle System Apps'),
- '$url' => (($url) ? $url : App::$cmd)
+ '$url' => (($url) ? $url : App::$cmd),
+ '$settings_url' => $settings_url
));
if(x($_SESSION, 'reload_avatar') && $observer) {