summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-08 10:16:55 -0700
committerBrion Vibber <brion@pobox.com>2010-04-08 10:16:55 -0700
commitee438cf1980c859ea0ff15ea455434ac26f7c90e (patch)
tree40a7fbc334291b27231f7f43a05f2306ad0280d2
parentf255b368edc06db8af57f7ad4d13542a126c42bc (diff)
parentecd31384ed9560aac350085733af4039cf344c8a (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
-rw-r--r--plugins/GeonamesPlugin.php2
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php18
2 files changed, 1 insertions, 19 deletions
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index 718af9e0b..bc5899943 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -458,7 +458,7 @@ class GeonamesPlugin extends Plugin
}
if (!$result->isOk()) {
- throw new Exception("HTTP error code " . $result->code);
+ throw new Exception("HTTP error code " . $result->getStatus());
}
$body = $result->getBody();
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 60bb3b68f..1c61b4fe5 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -234,24 +234,6 @@ class MobileProfilePlugin extends WAP20Plugin
}
- function onStartShowHeadElements($action)
- {
- // @fixme nothing appears to set a serveMobile on any action,
- // so this is useless and spews errors. Is this supposed to be
- // checking $this?
- //if (!$action->serveMobile) {
- // return true;
- //}
-
- $action->showTitle();
- $action->showShortcutIcon();
- $action->showStylesheets();
- $action->showFeeds();
- $action->showDescription();
- $action->extraHead();
- }
-
-
function onStartShowStatusNetStyles($action)
{
if (!$this->serveMobile) {