summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-06-25 21:01:59 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-06-25 21:01:59 +0000
commite268cb5fd1a81835180a0f6190b7929d03ce42d7 (patch)
treefceb6ca46e8edd22a720e43abd7e2bffe3a5b4ac /actions
parent6a0571d51b0cafb0dbc7caf3aa61cdfd17d6c7ce (diff)
parent801aa9165ec47c11c6f7c687d70f627bbd87f566 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'actions')
-rw-r--r--actions/newnotice.php5
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)));
}
/**