GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Comment out unreachable code spewing notices due to use of undefined variables in MobileProfile.

Browse Source 
This needs some cleanup...
This commit is contained in:
Brion Vibber 2010-04-06 12:13:54 -07:00
parent 3ac3bc32fc
commit edea825c70
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/MobileProfile/MobileProfilePlugin.php
View File

@ -73,9 +73,11 @@ class MobileProfilePlugin extends WAP20Plugin
$this->serveMobile = true; $this->serveMobile = true;
} else { } else {
// If they like the WAP 2.0 mimetype, serve them MP // If they like the WAP 2.0 mimetype, serve them MP
if (strstr('application/vnd.wap.xhtml+xml', $type) !== false) { // @fixme $type is undefined, making this if case useless and spewing errors.
$this->serveMobile = true; // What's the intent?
} else { //if (strstr('application/vnd.wap.xhtml+xml', $type) !== false) {
// $this->serveMobile = true;
//} else {
// If they are a mobile device that supports WAP 2.0, // If they are a mobile device that supports WAP 2.0,
// serve them MP // serve them MP
@ -149,7 +151,7 @@ class MobileProfilePlugin extends WAP20Plugin
break; break;
} }
} }
} //}
// If they are okay with MP, and the site has a mobile server, // If they are okay with MP, and the site has a mobile server,
// redirect there // redirect there
@ -167,7 +169,9 @@ class MobileProfilePlugin extends WAP20Plugin
return true; return true;
} }
if (!$type) { // @fixme $type is undefined, making this if case useless and spewing errors.
// What's the intent?
//if (!$type) {
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ?
$_SERVER['HTTP_ACCEPT'] : null; $_SERVER['HTTP_ACCEPT'] : null;
@ -180,7 +184,7 @@ class MobileProfilePlugin extends WAP20Plugin
throw new ClientException(_('This page is not available in a '. throw new ClientException(_('This page is not available in a '.
'media type you accept'), 406); 'media type you accept'), 406);
} }
} //}
header('Content-Type: '.$type); header('Content-Type: '.$type);
@ -221,9 +225,12 @@ class MobileProfilePlugin extends WAP20Plugin
function onStartShowHeadElements($action) function onStartShowHeadElements($action)
{ {
if (!$action->serveMobile) { // @fixme nothing appears to set a serveMobile on any action,
return true; // so this is useless and spews errors. Is this supposed to be
} // checking $this?
//if (!$action->serveMobile) {
// return true;
//}
$action->showTitle(); $action->showTitle();
$action->showShortcutIcon(); $action->showShortcutIcon();