Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / classes / User_group.php

diff --git a/classes/User_group.php b/classes/User_group.php
index 89731ee2644160cf06eabf6e7c1cd9cde1d0b1ce..78a7b9f1fdce87f6a5fa347807c0b97369da3952 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -126,7 +126,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));
             }
@@ -141,7 +141,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));
             }
@@ -154,8 +154,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;