Some Notice::saveNew cleanups.
* No need to check $source's value before inserting * No need to update the notice if the $uri was known in advance darcs-hash:20080902173804-57fc3-496ceaf8192694db43e62f7af1f57785a1a16a01.gz
This commit is contained in:
parent
c69504d423
commit
8f33885e41
|
@ -88,9 +88,8 @@ class Notice extends DB_DataObject
|
|||
$notice->created = common_sql_now();
|
||||
$notice->content = $content;
|
||||
$notice->rendered = common_render_content($notice->content, $notice);
|
||||
if ($source) {
|
||||
$notice->source = $source;
|
||||
}
|
||||
$notice->source = $source;
|
||||
$notice->uri = $uri;
|
||||
|
||||
$id = $notice->insert();
|
||||
|
||||
|
@ -98,15 +97,14 @@ class Notice extends DB_DataObject
|
|||
return _('Problem saving notice.');
|
||||
}
|
||||
|
||||
$orig = clone($notice);
|
||||
if ($uri) {
|
||||
$notice->uri = $uri;
|
||||
} else {
|
||||
# Update the URI after the notice is in the database
|
||||
if (!$uri) {
|
||||
$orig = clone($notice);
|
||||
$notice->uri = common_notice_uri($notice);
|
||||
}
|
||||
|
||||
if (!$notice->update($orig)) {
|
||||
return _('Problem saving notice.');
|
||||
if (!$notice->update($orig)) {
|
||||
return _('Problem saving notice.');
|
||||
}
|
||||
}
|
||||
|
||||
# XXX: do we need to change this for remote users?
|
||||
|
|
Loading…
Reference in New Issue
Block a user