From 72707ddc26868597cadf8889da3d4ee556c9753e Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 19 Apr 2014 22:24:40 +0200 Subject: [PATCH] deprecate Notice::bestUrl() in favor of getUrl() --- classes/Notice.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index e46ed227a1..0264c62275 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1697,15 +1697,13 @@ class Notice extends Managed_DataObject return $noun->asString('activity:' . $element); } + // FIXME: Replace all bestUrl with getUrl and do exception handling function bestUrl() { - if (!empty($this->url)) { - return $this->url; - } else if (!empty($this->uri) && preg_match('/^https?:/', $this->uri)) { - return $this->uri; - } else { - return common_local_url('shownotice', - array('notice' => $this->id)); + try { + return $this->getUrl(); + } catch (InvalidUrlException $e) { + return common_local_url('shownotice', array('notice' => $this->id)); } } -- 2.39.5