GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Only report local URLs for local groups

This commit is contained in:
Mikael Nordfeldth 2015-01-26 12:10:15 +01:00
parent 97812549b9
commit 9f9af9a139
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/User_group.php
View File

@ -113,7 +113,7 @@ class User_group extends Managed_DataObject
// normally stored in mainpage, but older ones may be null // normally stored in mainpage, but older ones may be null
if (!empty($this->mainpage)) { if (!empty($this->mainpage)) {
$url = $this->mainpage; $url = $this->mainpage;
} else { } elseif ($this->isLocal()) {
$url = common_local_url('showgroup', $url = common_local_url('showgroup',
array('nickname' => $this->nickname)); array('nickname' => $this->nickname));
} }
@ -128,7 +128,7 @@ class User_group extends Managed_DataObject
if (Event::handle('StartUserGroupGetUri', array($this, &$uri))) { if (Event::handle('StartUserGroupGetUri', array($this, &$uri))) {
if (!empty($this->uri)) { if (!empty($this->uri)) {
$uri = $this->uri; $uri = $this->uri;
} else { } elseif ($this->isLocal()) {
$uri = common_local_url('groupbyid', $uri = common_local_url('groupbyid',
array('id' => $this->id)); array('id' => $this->id));
} }
@ -141,8 +141,10 @@ class User_group extends Managed_DataObject
{ {
$url = null; $url = null;
if (Event::handle('StartUserGroupPermalink', array($this, &$url))) { if (Event::handle('StartUserGroupPermalink', array($this, &$url))) {
$url = common_local_url('groupbyid', if ($this->isLocal()) {
array('id' => $this->id)); $url = common_local_url('groupbyid',
array('id' => $this->id));
}
} }
Event::handle('EndUserGroupPermalink', array($this, &$url)); Event::handle('EndUserGroupPermalink', array($this, &$url));
return $url; return $url;