Commit 85b02224 authored by mmn's avatar mmn

Handle missing URIs and URLs better

parent 3e2136f2
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment