From 9f9af9a13928f9ec52d7ee6744db4c95610c9355 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 26 Jan 2015 12:10:15 +0100 Subject: [PATCH] Only report local URLs for local groups --- classes/User_group.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/classes/User_group.php b/classes/User_group.php index aad38b6358..875f5d650e 100644 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -113,7 +113,7 @@ class User_group extends Managed_DataObject // normally stored in mainpage, but older ones may be null if (!empty($this->mainpage)) { $url = $this->mainpage; - } else { + } elseif ($this->isLocal()) { $url = common_local_url('showgroup', array('nickname' => $this->nickname)); } @@ -128,7 +128,7 @@ class User_group extends Managed_DataObject if (Event::handle('StartUserGroupGetUri', array($this, &$uri))) { if (!empty($this->uri)) { $uri = $this->uri; - } else { + } elseif ($this->isLocal()) { $uri = common_local_url('groupbyid', array('id' => $this->id)); } @@ -141,8 +141,10 @@ class User_group extends Managed_DataObject { $url = null; if (Event::handle('StartUserGroupPermalink', array($this, &$url))) { - $url = common_local_url('groupbyid', - array('id' => $this->id)); + if ($this->isLocal()) { + $url = common_local_url('groupbyid', + array('id' => $this->id)); + } } Event::handle('EndUserGroupPermalink', array($this, &$url)); return $url;