forked from GNUsocial/gnu-social
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
This commit is contained in:
commit
ee438cf198
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user