diff options
| author | Brion Vibber <brion@pobox.com> | 2010-01-13 23:39:39 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-01-13 23:39:39 -0800 |
| commit | f4b47c7e641019a6027be7cdc231a893a368b4db (patch) | |
| tree | 0061bc9c1681df8c2497919ee0f85d34b8f21de8 | |
| parent | 8a7171fde610246e5820ee04441955bd8dd463bf (diff) | |
| parent | 28fafe803a82a0f5885655dfcad5e835163d3139 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline
| -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)) { |