Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

1 files changed, 4 insertions, 1 deletions

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3677f54c2..15caff6ea 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -326,6 +326,8 @@ class NewnoticeAction extends Action
         }
 
         $this->maybeAddRedir($file_id, $short);
+
+        return $file;
     }
 
     function maybeAddRedir($file_id, $url)
@@ -350,7 +352,8 @@ class NewnoticeAction extends Action
     {
         File_to_post::processNew($filerec->id, $notice->id);
 
-        $this->maybeAddRedir($filerec->id, common_local_url('file', array('notice' => $this->notice->id)));
+        $this->maybeAddRedir($filerec->id,
+            common_local_url('file', array('notice' => $notice->id)));
     }
 
     /**