From 85b022246f55c7e26190c77a1fab2b67ad4c317c Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 18 Apr 2014 23:36:01 +0200 Subject: [PATCH] Handle missing URIs and URLs better --- classes/Notice.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/classes/Notice.php b/classes/Notice.php index 56be89fb12..d9bdbc4498 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -424,6 +424,16 @@ class Notice extends Managed_DataObject $notice->created = common_sql_now(); } + if (!$notice->isLocal()) { + // Only do these checks for non-local notices. Local notices will generate these values later. + if (!common_valid_http_url($url)) { + common_debug('Bad notice URL: ['.$url.'] Cannot link back to original!'); + } + if (empty($uri)) { + throw new ServerException('No URI for remote notice. Cannot accept that.'); + } + } + $notice->content = $final; $notice->source = $source; @@ -600,6 +610,11 @@ class Notice extends Managed_DataObject $changed = true; } + if (empty($url)) { + $notice->url = common_local_url('shownotice', array('notice' => $notice->id), null, null, false); + $changed = true; + } + // If it's not part of a conversation, it's // the beginning of a new conversation. -- 2.39.5