wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw exception when we can't get the url for a notice

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-04-18 23:17:15 +02:00
parent 7025817cc1
commit e0e69ddd7c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/Notice.php
View File

@ -213,7 +213,15 @@ class Notice extends Managed_DataObject
public function getUrl() public function getUrl()
{ {
// The risk is we start having empty urls and non-http uris... // The risk is we start having empty urls and non-http uris...
return $this->url ?: $this->uri; // and we can't really handle any other protocol right now.
switch (true) {
case common_valid_http_url($this->url):
return $this->url;
case common_valid_http_url($this->uri):
return $this->uri;
default:
throw new ServerException('No URL available for notice.');
}
} }
public function get_object_type($canonical=false) { public function get_object_type($canonical=false) {