diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-10-30 21:45:22 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-10-30 21:45:22 +0000 |
| commit | a2302e5b76b827f906c5ded028e7c120c6200b76 (patch) | |
| tree | 0c0d3af1c94cfde82074191301870f56624f6b5c /actions | |
| parent | db9aef9f67a9448e73f6ee3463329045e41084f3 (diff) | |
| parent | b7ed31c27bc883b7b7b6a9af6391aacd8d897d78 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/newmessage.php | 4 | ||||
| -rw-r--r-- | actions/shownotice.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/actions/newmessage.php b/actions/newmessage.php index a0b17fc18..eac4ab210 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -99,7 +99,9 @@ class NewmessageAction extends Action $user = common_current_user(); if (!$user) { - $this->clientError(_('Only logged-in users can send direct messages.'), 403); + /* Go log in, and then come back. */ + common_set_returnto($_SERVER['REQUEST_URI']); + common_redirect(common_local_url('login')); return false; } diff --git a/actions/shownotice.php b/actions/shownotice.php index 41408c23c..5d16fdad9 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -172,9 +172,9 @@ class ShownoticeAction extends OwnerDesignAction function title() { if (!empty($this->profile->fullname)) { - $base = $this->profile->fullname . ' (' . $this->user->nickname . ') '; + $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') '; } else { - $base = $this->user->nickname; + $base = $this->profile->nickname; } return sprintf(_('%1$s\'s status on %2$s'), |