summaryrefslogtreecommitdiff
path: root/lib/twitterapi.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-17 15:05:24 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-17 15:05:24 -0700
commit420e8994f8f62c22073e70e081daadfa2d8d7c06 (patch)
tree67aaba76513bc1f60382beab2223c32c80f942a9 /lib/twitterapi.php
parent07f5797f2fd1a425027190d424e359a1b4c4c8be (diff)
parentcd1361fe960eb3afbbdb34b14061b8475dea60c8 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into taggedprofile
Diffstat (limited to 'lib/twitterapi.php')
-rw-r--r--lib/twitterapi.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 569bc6d7a..269b60efc 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -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;