diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
| commit | bac2d80c919a78d5cafd57f712872a90cda04847 (patch) | |
| tree | d2df10a582edc0bf9e043f1c764953a290927678 /actions/userbyid.php | |
| parent | 9a1a83e8ebe5ad39838e6363f1537a1a5232b9cb (diff) | |
| parent | 6a1afda259c5223449f679a64f932e36df5ebe39 (diff) | |
Merge branch '0.9.x' into adminpanel
Conflicts:
classes/User.php
Diffstat (limited to 'actions/userbyid.php')
| -rw-r--r-- | actions/userbyid.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actions/userbyid.php b/actions/userbyid.php index 802bcb081..86a61f20b 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -74,8 +74,11 @@ class UserbyidAction extends Action $this->clientError(_('No such user.')); } - // support redirecting to FOAF rdf/xml if the agent prefers it - $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2'; + // Support redirecting to FOAF rdf/xml if the agent prefers it... + // Internet Explorer doesn't specify "text/html" and does list "*/*" + // at least through version 8. We need to list text/html up front to + // ensure that only user-agents who specifically ask for RDF get it. + $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2'; $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null; $type = common_negotiate_type(common_accept_to_prefs($httpaccept), |