forked from GNUsocial/gnu-social
redirect to original URL or URI for remote notices
This commit is contained in:
parent
d1b2a9d708
commit
8f64c247fd
@ -177,10 +177,17 @@ class ShownoticeAction extends Action
|
||||
{
|
||||
parent::handle($args);
|
||||
|
||||
$this->showPage();
|
||||
if ($this->notice->is_local == 0) {
|
||||
if (!empty($this->notice->url)) {
|
||||
common_redirect($this->notice->url, 301);
|
||||
} else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
|
||||
common_redirect($this->notice->uri, 301);
|
||||
}
|
||||
} else {
|
||||
$this->showPage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Don't show local navigation
|
||||
*
|
||||
@ -191,7 +198,6 @@ class ShownoticeAction extends Action
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Fill the content area of the page
|
||||
*
|
||||
@ -208,8 +214,6 @@ class ShownoticeAction extends Action
|
||||
$this->elementEnd('ul');
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Don't show page notice
|
||||
*
|
||||
@ -220,7 +224,6 @@ class ShownoticeAction extends Action
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Don't show aside
|
||||
*
|
||||
@ -230,7 +233,6 @@ class ShownoticeAction extends Action
|
||||
function showAside() {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Extra <head> content
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user