diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
| commit | 280f8faab4f692ff7f4389f82397adfa6db56325 (patch) | |
| tree | 94a076bfb3d13c7e6699e0149ee75fff6801880c /lib/twitterapi.php | |
| parent | bb3361467c002e38aa3a424672f332b32a647e17 (diff) | |
| parent | eb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff) | |
Merge branch '0.8.x' into small-fixes
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
Diffstat (limited to 'lib/twitterapi.php')
| -rw-r--r-- | lib/twitterapi.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/twitterapi.php b/lib/twitterapi.php index 569bc6d7a..f538a0298 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -1,7 +1,7 @@ <?php /* * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. + * Copyright (C) 2008, 2009, Control Yourself, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -545,7 +545,7 @@ class TwitterapiAction extends Action $this->init_twitter_atom(); break; default: - $this->client_error(_('Not a supported data format.')); + $this->clientError(_('Not a supported data format.')); break; } @@ -573,13 +573,13 @@ class TwitterapiAction extends Action $this->end_twitter_rss(); break; default: - $this->client_error(_('Not a supported data format.')); + $this->clientError(_('Not a supported data format.')); break; } return; } - function client_error($msg, $code = 400, $content_type = 'json') + function clientError($msg, $code = 400, $content_type = 'json') { static $status = array(400 => 'Bad Request', @@ -666,7 +666,7 @@ class TwitterapiAction extends Action $this->show_json_objects($profile_array); break; default: - $this->client_error(_('Not a supported data format.')); + $this->clientError(_('Not a supported data format.')); return; } return; |