diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-08 23:10:34 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-08 23:10:34 +0000 |
| commit | 8e58f241739b97bd53f78035781f16e2067a31d9 (patch) | |
| tree | 8ad366f5f408d1181b1816f607a120fe0c91c502 /lib/api.php | |
| parent | 2a0a363e1d846334bc37d46b5f6f42e64a5a96eb (diff) | |
| parent | b78a35ec73980d8dfa2fcb68ef81936f4b3c110b (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/api.php')
| -rw-r--r-- | lib/api.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/api.php b/lib/api.php index a1236ab7e..fb4c4289b 100644 --- a/lib/api.php +++ b/lib/api.php @@ -66,7 +66,7 @@ class ApiAction extends Action * * @param array $args Web and URL arguments * - * @return boolean false if user doesn't exist + * @return boolean false if user does not exist */ function prepare($args) @@ -138,7 +138,7 @@ class ApiAction extends Action $design = null; $user = $profile->getUser(); - // Note: some profiles don't have an associated user + // Note: some profiles do not have an associated user if (!empty($user)) { $design = $user->getDesign(); @@ -203,7 +203,7 @@ class ApiAction extends Action if ($get_notice) { $notice = $profile->getCurrentNotice(); if ($notice) { - # don't get user! + # do not get user! $twitter_user['status'] = $this->twitterStatusArray($notice, false); } } @@ -263,7 +263,7 @@ class ApiAction extends Action } if ($include_user) { - # Don't get notice (recursive!) + # Do not get notice (recursive!) $twitter_user = $this->twitterUserArray($profile, false); $twitter_status['user'] = $twitter_user; } @@ -1074,7 +1074,7 @@ class ApiAction extends Action function initTwitterAtom() { $this->startXML(); - // FIXME: don't hardcode the language here! + // FIXME: do not hardcode the language here! $this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', 'xml:lang' => 'en-US', 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0')); @@ -1116,7 +1116,7 @@ class ApiAction extends Action return User::staticGet('nickname', $nickname); } else if ($this->arg('user_id')) { // This is to ensure that a non-numeric user_id still - // overrides screen_name even if it doesn't get used + // overrides screen_name even if it does not get used if (is_numeric($this->arg('user_id'))) { return User::staticGet('id', $this->arg('user_id')); } @@ -1146,7 +1146,7 @@ class ApiAction extends Action return User_group::staticGet('nickname', $nickname); } else if ($this->arg('group_id')) { // This is to ensure that a non-numeric user_id still - // overrides screen_name even if it doesn't get used + // overrides screen_name even if it does not get used if (is_numeric($this->arg('group_id'))) { return User_group::staticGet('id', $this->arg('group_id')); } |