diff options
| author | Brion Vibber <brion@pobox.com> | 2010-01-15 09:52:50 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-01-15 09:52:50 -0800 |
| commit | ef016dca45b17e7a9e8aae17ffe1b5caf0e2694c (patch) | |
| tree | 3fe3b0a03aa1034d03618167432481f321804138 /actions | |
| parent | a27aef92060277120f8889136ed6972f5915709f (diff) | |
| parent | 038287c1ffb71207f8028014f20005483364956d (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/all.php | 2 | ||||
| -rw-r--r-- | actions/apitimelinefriends.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actions/all.php b/actions/all.php index efa4521e2..3eb185214 100644 --- a/actions/all.php +++ b/actions/all.php @@ -81,7 +81,7 @@ class AllAction extends ProfileAction function title() { if ($this->page > 1) { - return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page); + return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page); } else { return sprintf(_("%s and friends"), $this->user->nickname); } diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index ef58b103c..4e3827bae 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -72,7 +72,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction function prepare($args) { parent::prepare($args); - common_debug("api friends_timeline"); $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { |