summaryrefslogtreecommitdiff
path: root/actions/login.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-10 14:26:49 -0500
committerEvan Prodromou <evan@status.net>2009-11-10 14:26:49 -0500
commit7ae10c27b0725a7108b63a788affd4d07e37afdc (patch)
tree92f952319071ba770136d3e69a82e51040ecb6b5 /actions/login.php
parent8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 (diff)
parent737fe763471bcb6ebd95c318363308a33e28e889 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: lib/util.php
Diffstat (limited to 'actions/login.php')
-rw-r--r--actions/login.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/login.php b/actions/login.php
index 679817520..ad57dd667 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -159,7 +159,7 @@ class LoginAction extends Action
$url = common_get_returnto();
if ($url) {
- // We do not have to return to it again
+ // We don't have to return to it again
common_set_returnto(null);
} else {
$url = common_local_url('all',