From 8a02cad42468c628b7b77910458c706c5d26f4df Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 8 Apr 2010 10:09:56 -0700 Subject: drop onStartShowHeadElements handler from MobileProfile; just duplicated the original code path, and after removing the bogus notice-spewing code it was running those things twice. --- plugins/MobileProfile/MobileProfilePlugin.php | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'plugins') 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) { -- cgit v1.2.3-54-g00ecf From ecd31384ed9560aac350085733af4039cf344c8a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 8 Apr 2010 10:11:52 -0700 Subject: Fix for error during handling of HTTP error response case in Geonames lookups --- plugins/GeonamesPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') 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(); -- cgit v1.2.3-54-g00ecf