eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Handle missing URIs and URLs better

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-04-18 23:36:01 +02:00
parent 3e2136f222
commit 85b022246f
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/Notice.php
View File

@ -424,6 +424,16 @@ class Notice extends Managed_DataObject
$notice->created = common_sql_now(); $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->content = $final;
$notice->source = $source; $notice->source = $source;
@ -600,6 +610,11 @@ class Notice extends Managed_DataObject
$changed = true; $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 // If it's not part of a conversation, it's
// the beginning of a new conversation. // the beginning of a new conversation.