summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Avtalion <ori@avtalion.name>2008-09-02 13:38:04 -0400
committerOri Avtalion <ori@avtalion.name>2008-09-02 13:38:04 -0400
commit8f33885e4179ee5d81c70d4d2bf342641c7fd5c9 (patch)
tree78804b413319d007e7db39346398020697feae7b
parentc69504d423ef5fcfe9802345cf3670b0b30b27c7 (diff)
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
-rw-r--r--classes/Notice.php18
1 files changed, 8 insertions, 10 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 06750b436..6cfd0d786 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -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?