Replace goaway location SESSION var return_url with page as string value
This commit is contained in:
parent
23be68e74d
commit
d8780b1640
5 changed files with 8 additions and 10 deletions
|
@ -354,7 +354,7 @@ function drop_item($id)
|
|||
|
||||
if (!DBA::isResult($item)) {
|
||||
notice(L10n::t('Item not found.') . EOL);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
goaway('/network');
|
||||
}
|
||||
|
||||
if ($item['deleted']) {
|
||||
|
@ -401,17 +401,17 @@ function drop_item($id)
|
|||
}
|
||||
// Now check how the user responded to the confirmation query
|
||||
if (!empty($_REQUEST['canceled'])) {
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
goaway('/item/drop/' . $id);
|
||||
}
|
||||
|
||||
// delete the item
|
||||
Item::deleteForUser(['id' => $item['id']], local_user());
|
||||
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
goaway('/item/drop/' . $id);
|
||||
//NOTREACHED
|
||||
} else {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
goaway('/item/drop/' . $id);
|
||||
//NOTREACHED
|
||||
}
|
||||
}
|
||||
|
|
|
@ -187,7 +187,7 @@ function events_post(App $a)
|
|||
Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
|
||||
}
|
||||
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/events');
|
||||
}
|
||||
|
||||
function events_content(App $a)
|
||||
|
|
|
@ -25,9 +25,7 @@ function filerm_content(App $a) {
|
|||
file_tag_unsave_file(local_user(),$item_id,$term, $category);
|
||||
}
|
||||
|
||||
if (x($_SESSION,'return_url')) {
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
goaway('/network');
|
||||
|
||||
killme();
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ function ostatus_subscribe_content(App $a) {
|
|||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/ostatus_subscribe');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ function repair_ostatus_content(App $a) {
|
|||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/ostatus_repair');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue