aboutsummaryrefslogtreecommitdiffstats
path: root/mod/manage.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
committerAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
commit0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch)
treea92197de4503ec52889dc05483493f4df1a305b8 /mod/manage.php
parent99d9456b3addc651a68874ddd391d25684252c4d (diff)
parentb4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff)
downloadvolse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'mod/manage.php')
-rw-r--r--mod/manage.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/mod/manage.php b/mod/manage.php
index cb845befe..5ac3e6af8 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -29,7 +29,7 @@ function manage_content(&$a) {
$r = change_channel($change_channel);
if((argc() > 2) && !(argv(2) === 'default')) {
- goaway(z_root() . '/' . implode('/',array_slice($a->argv,2))); // Go to whatever is after /manage/, but with the new channel
+ goaway(z_root() . '/' . implode('/',array_slice(App::$argv,2))); // Go to whatever is after /manage/, but with the new channel
}
else {
if($r && $r['channel_startpage'])
@@ -45,7 +45,7 @@ function manage_content(&$a) {
intval(get_account_id())
);
- $account = get_app()->get_account();
+ $account = App::get_account();
if($r && count($r)) {
$channels = $r;
@@ -167,9 +167,7 @@ function manage_content(&$a) {
'$intros_format' => t('%d new introductions'),
'$channel_usage_message' => $channel_usage_message,
'$delegated_desc' => t('Delegated Channel'),
- '$delegates' => $delegates,
- '$locs' => t('Manage locations')
-
+ '$delegates' => $delegates
));
return $o;