Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / plugins / MobileProfile / MobileProfilePlugin.php

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index bf16cd9f56690fe6c06042b4d123d420f63f8a2b..9d7075a3a267750560922a399da57575e60ececc 100644 (file)
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -59,7 +59,7 @@ class MobileProfilePlugin extends WAP20Plugin
         parent::__construct();
     }
 
-    function onStartShowHTML($action)
+    function onStartShowHTML(Action $action)
     {
         // XXX: This should probably graduate to WAP20Plugin
 
@@ -72,7 +72,7 @@ class MobileProfilePlugin extends WAP20Plugin
         } else if (isset($_COOKIE['MobileOverride'])) {
             // Cookie override is controlled by link at bottom.
             $this->serveMobile = (bool)$_COOKIE['MobileOverride'];
-        } else {
+        } elseif (array_key_exists('HTTP_USER_AGENT', $_SERVER)) {
             // If they like the WAP 2.0 mimetype, serve them MP
             // @fixme $type is undefined, making this if case useless and spewing errors.
             // What's the intent?
@@ -316,14 +316,14 @@ class MobileProfilePlugin extends WAP20Plugin
         $action->elementEnd('address');
     }
 
-    function onStartShowAside($action)
+    function onStartShowAside(Action $action)
     {
         if ($this->serveMobile) {
             return false;
         }
     }
 
-    function onStartShowLocalNavBlock($action)
+    function onStartShowLocalNavBlock(Action $action)
     {
         if ($this->serveMobile) {
             // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
@@ -332,7 +332,7 @@ class MobileProfilePlugin extends WAP20Plugin
         }
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
         $action->inlineScript('
@@ -406,7 +406,7 @@ class MobileProfilePlugin extends WAP20Plugin
         return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'MobileProfile',
                             'version' => GNUSOCIAL_VERSION,