aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-21 20:23:31 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-21 20:23:31 +0200
commit9638bf2b1eeb805b27eaf2f2e1e8a09bfd5c5514 (patch)
treeeb2c72120cd2b2e0625b3d02ede424b80c1ebe27 /Zotlabs
parent6f43468724fccec3b37b7411a5ecb45a3ebe2e0b (diff)
downloadvolse-hubzilla-9638bf2b1eeb805b27eaf2f2e1e8a09bfd5c5514.tar.gz
volse-hubzilla-9638bf2b1eeb805b27eaf2f2e1e8a09bfd5c5514.tar.bz2
volse-hubzilla-9638bf2b1eeb805b27eaf2f2e1e8a09bfd5c5514.zip
provide a return path from settings pages
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Apps.php3
-rw-r--r--Zotlabs/Module/Settings/Connections.php2
-rw-r--r--Zotlabs/Module/Settings/Network.php2
3 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index b35eb9844..010947467 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -524,7 +524,8 @@ class Apps {
'$add' => t('Add to app-tray'),
'$remove' => t('Remove from app-tray'),
'$add_nav' => t('Pin to navbar'),
- '$remove_nav' => t('Unpin from navbar')
+ '$remove_nav' => t('Unpin from navbar'),
+ '$rpath' => z_root() . '/apps'
));
}
diff --git a/Zotlabs/Module/Settings/Connections.php b/Zotlabs/Module/Settings/Connections.php
index 361d86ccb..425409502 100644
--- a/Zotlabs/Module/Settings/Connections.php
+++ b/Zotlabs/Module/Settings/Connections.php
@@ -19,10 +19,12 @@ class Connections {
function get() {
$features = self::get_features();
+ $rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
+ '$rpath' => $rpath,
'$action_url' => 'settings/connections',
'$form_security_token' => get_form_security_token("settings_connections"),
'$title' => t('Connections Settings'),
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index 1e39121c8..a2e606565 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -19,10 +19,12 @@ class Network {
function get() {
$features = self::get_features();
+ $rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
+ '$rpath' => $rpath,
'$action_url' => 'settings/network',
'$form_security_token' => get_form_security_token("settings_network"),
'$title' => t('Activity Settings'),