X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=opensearch_desc.php;h=b546cbf6e8f5167e0fb6c01d9798d78c88972038;hp=bd3281aa9c6c3ba4d6d0c715dd79de5e15e38f9b;hb=4d10bb14e81aadb907a00e4bd13973ef668ab1f8;hpb=b3f03fd75efbf1a01910ccb27e9e8860de70aa29 diff --git a/opensearch_desc.php b/opensearch_desc.php index bd3281aa9c..b546cbf6e8 100644 --- a/opensearch_desc.php +++ b/opensearch_desc.php @@ -36,7 +36,7 @@ if ( $wgRequest->getVal( 'ctype' ) == 'application/xml' ) { $response = $wgRequest->response(); $response->header( "Content-type: $ctype" ); -// Set an Expires header so that squid can cache it for a short time +// Set an Expires header so that CDN can cache it for a short time // Short enough so that the sysadmin barely notices when $wgSitename is changed $expiryTime = 600; # 10 minutes $response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expiryTime ) . ' GMT' ); @@ -48,17 +48,16 @@ print Xml::openElement( 'OpenSearchDescription', 'xmlns' => 'http://a9.com/-/spec/opensearch/1.1/', 'xmlns:moz' => 'http://www.mozilla.org/2006/browser/search/' ] ); -/* The spec says the ShortName must be no longer than 16 characters, - * but 16 is *realllly* short. In practice, browsers don't appear to care - * when we give them a longer string, so we're no longer attempting to trim. - * - * Note: ShortName and the need to match; they are used as - * a key for identifying if the search engine has been added already, *and* - * as the display name presented to the end-user. - * - * Behavior seems about the same between Firefox and IE 7/8 here. - * 'Description' doesn't appear to be used by either. - */ +// The spec says the ShortName must be no longer than 16 characters, +// but 16 is *realllly* short. In practice, browsers don't appear to care +// when we give them a longer string, so we're no longer attempting to trim. +// +// Note: ShortName and the need to match; they are used as +// a key for identifying if the search engine has been added already, *and* +// as the display name presented to the end-user. +// +// Behavior seems about the same between Firefox and IE 7/8 here. +// 'Description' doesn't appear to be used by either. $fullName = wfMessage( 'opensearch-desc' )->inContentLanguage()->text(); print Xml::element( 'ShortName', null, $fullName ); print Xml::element( 'Description', null, $fullName );