summaryrefslogtreecommitdiff
path: root/lib/settingsaction.php
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
commitb10f362ede8c39746c168363bf4fa6481995592b (patch)
treec7a6d4d2ca280ba50d1dbac1113507432e3fe12e /lib/settingsaction.php
parent5ab709b73977131813884558bf56d97172a7aa26 (diff)
parentfc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/settingsaction.php')
-rw-r--r--lib/settingsaction.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 4193ea521..c3669868d 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -72,7 +72,7 @@ class SettingsAction extends CurrentUserDesignAction
$this->clientError(_('Not logged in.'));
return;
} else if (!common_is_real_login()) {
- // Cookie theft means that automatic logins cannot
+ // Cookie theft means that automatic logins can't
// change important settings or see private info, and
// _all_ our settings are important
common_set_returnto($this->selfUrl());