wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brion Vibber 2010-04-08 10:16:55 -07:00
commit ee438cf198
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GeonamesPlugin.php
View File

@ -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();

18
plugins/MobileProfile/MobileProfilePlugin.php
View File

@ -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) {