diff options
| author | Zach Copley <zach@status.net> | 2009-11-19 20:51:20 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-19 20:51:20 -0800 |
| commit | 003b25ee5690771ab9d8c28a85352abfee62cd0a (patch) | |
| tree | ac0ba59c0c7e96474aec98d18e106985e6f451b1 /plugins | |
| parent | e3de04f8cd494ba255ff6167542fda849c2fa61c (diff) | |
| parent | e1fcac0e0908be45c9aa7e840a6fcb2ca600eac5 (diff) | |
Merge branch '0.9-release'
* 0.9-release:
Changed DEFINE name to avoid conflicts
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/MobileProfile/MobileProfilePlugin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index c257f3fd8..0b1e4de28 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -define('PAGE_TYPE_PREFS', +define('PAGE_TYPE_PREFS_MOBILEPROFILE', 'application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html;q=0.9'); require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php'; @@ -172,7 +172,7 @@ class MobileProfilePlugin extends WAP20Plugin $_SERVER['HTTP_ACCEPT'] : null; $cp = common_accept_to_prefs($httpaccept); - $sp = common_accept_to_prefs(PAGE_TYPE_PREFS); + $sp = common_accept_to_prefs(PAGE_TYPE_PREFS_MOBILEPROFILE); $type = common_negotiate_type($cp, $sp); |