fixup conflicts

darcs-hash:20080706221758-84dde-5e222a282f9a1bd242d2653700c444e93e21cc7f.gz

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 9aaf4b4d3bcd7665bf064a097a976cad93c8cf73..607f4b087101c2a70506e8b69b8a3a24ee39fd7a 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -73,7 +73,9 @@ class NewnoticeAction extends Action {
                        common_server_error(_t('Problem saving notice.'));
                        return;
                }
-               
+
+        common_save_replies($notice);  
+
                common_broadcast_notice($notice);
                $returnto = $this->trimmed('returnto');
                if ($returnto) {