summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-08 17:52:20 -0500
committerEvan Prodromou <evan@status.net>2009-12-08 17:52:20 -0500
commit21757186e9a7ffd2e3330fd4ef61ffeb2dc0229b (patch)
treee2715f48a0e8deeed92d98fe1504a4e9bf991a73
parent985d6a0de424b682ebe7f3f90a504ba3e70f2f61 (diff)
don't allow forwarding your own notice
-rw-r--r--actions/forward.php5
-rw-r--r--lib/noticelist.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/actions/forward.php b/actions/forward.php
index 867ed97d2..194833fe0 100644
--- a/actions/forward.php
+++ b/actions/forward.php
@@ -72,6 +72,11 @@ class ForwardAction extends Action
return false;
}
+ if ($this->user->id == $this->notice->profile_id) {
+ $this->clientError(_("You can't forward your own notice."));
+ return false;
+ }
+
$token = $this->trimmed('token-'.$id);
if (empty($token) || $token != common_session_token()) {
diff --git a/lib/noticelist.php b/lib/noticelist.php
index b38860880..d6ffc9ca9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -540,7 +540,7 @@ class NoticeListItem extends Widget
function showForwardForm()
{
$user = common_current_user();
- if ($user) {
+ if ($user && $user->id != $this->notice->profile_id) {
$profile = $user->getProfile();
if ($profile->hasForwarded($this->notice->id)) {
$this->out->text(_('Forwarded'));