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

deprecate Notice::bestUrl() in favor of getUrl()

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-04-19 22:24:40 +02:00
parent 7ca6597c7f
commit 72707ddc26
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/Notice.php
View File

@ -1697,15 +1697,13 @@ class Notice extends Managed_DataObject
return $noun->asString('activity:' . $element); return $noun->asString('activity:' . $element);
} }
// FIXME: Replace all bestUrl with getUrl and do exception handling
function bestUrl() function bestUrl()
{ {
if (!empty($this->url)) { try {
return $this->url; return $this->getUrl();
} else if (!empty($this->uri) && preg_match('/^https?:/', $this->uri)) { } catch (InvalidUrlException $e) {
return $this->uri; return common_local_url('shownotice', array('notice' => $this->id));
} else {
return common_local_url('shownotice',
array('notice' => $this->id));
} }
} }