Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index 718af9e0b500d836fbe031e9f387f4b53a32b12d..bc5899943beab5594abee3ec9495cf12b66d2d2f 100644 (file)
--- 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 60bb3b68fa3c968aa56c57571ca684c264d26976..1c61b4fe5291c88dbec0d1d87d749930d2b800dc 100644 (file)
--- 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) {