We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit ee438cf1 authored by Brion Vibber's avatar Brion Vibber

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

parents f255b368 ecd31384
......@@ -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();
......
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment