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

Some Notice::saveNew cleanups.

Browse Source 
* 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:
Ori Avtalion 2008-09-02 13:38:04 -04:00
parent c69504d423
commit 8f33885e41
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/Notice.php
View File

@ -88,9 +88,8 @@ class Notice extends DB_DataObject
$notice->created = common_sql_now(); $notice->created = common_sql_now();
$notice->content = $content; $notice->content = $content;
$notice->rendered = common_render_content($notice->content, $notice); $notice->rendered = common_render_content($notice->content, $notice);
if ($source) { $notice->source = $source;
$notice->source = $source; $notice->uri = $uri;
}
$id = $notice->insert(); $id = $notice->insert();
@ -98,15 +97,14 @@ class Notice extends DB_DataObject
return _('Problem saving notice.'); return _('Problem saving notice.');
} }
$orig = clone($notice); # Update the URI after the notice is in the database
if ($uri) { if (!$uri) {
$notice->uri = $uri; $orig = clone($notice);
} else {
$notice->uri = common_notice_uri($notice); $notice->uri = common_notice_uri($notice);
}
if (!$notice->update($orig)) { if (!$notice->update($orig)) {
return _('Problem saving notice.'); return _('Problem saving notice.');
}
} }
# XXX: do we need to change this for remote users? # XXX: do we need to change this for remote users?