X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=opensearch_desc.php;h=bef168878f1df4fc3517abe347d22de53af625e0;hb=eeffd593b87742427c8dd0bb0d89773afd000f66;hp=0b5697270a7a2be9546b011b0d5922cb44ae95c8;hpb=02255540d5344d79d122dd534a77968317fbefe6;p=lhc%2Fweb%2Fwiklou.git diff --git a/opensearch_desc.php b/opensearch_desc.php index 0b5697270a..bef168878f 100644 --- a/opensearch_desc.php +++ b/opensearch_desc.php @@ -40,20 +40,21 @@ $response->header( 'Cache-control: max-age=600' ); print ''; print Xml::openElement( 'OpenSearchDescription', - array( + [ 'xmlns' => 'http://a9.com/-/spec/opensearch/1.1/', - 'xmlns:moz' => 'http://www.mozilla.org/2006/browser/search/' ) ); + '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 ); @@ -61,22 +62,22 @@ print Xml::element( 'Description', null, $fullName ); // By default we'll use the site favicon. // Double-check if IE supports this properly? print Xml::element( 'Image', - array( + [ 'height' => 16, 'width' => 16, - 'type' => 'image/x-icon' ), + 'type' => 'image/x-icon' ], wfExpandUrl( $wgFavicon, PROTO_CURRENT ) ); -$urls = array(); +$urls = []; // General search template. Given an input term, this should bring up // search results or a specific found page. // At least Firefox and IE 7 support this. $searchPage = SpecialPage::getTitleFor( 'Search' ); -$urls[] = array( +$urls[] = [ 'type' => 'text/html', 'method' => 'get', - 'template' => $searchPage->getCanonicalURL( 'search={searchTerms}' ) ); + 'template' => $searchPage->getCanonicalURL( 'search={searchTerms}' ) ]; foreach ( $wgOpenSearchTemplates as $type => $template ) { if ( !$template && $wgEnableAPI ) { @@ -84,17 +85,17 @@ foreach ( $wgOpenSearchTemplates as $type => $template ) { } if ( $template ) { - $urls[] = array( + $urls[] = [ 'type' => $type, 'method' => 'get', 'template' => $template, - ); + ]; } } // Allow hooks to override the suggestion URL settings in a more // general way than overriding the whole search engine... -Hooks::run( 'OpenSearchUrls', array( &$urls ) ); +Hooks::run( 'OpenSearchUrls', [ &$urls ] ); foreach ( $urls as $attribs ) { print Xml::element( 'Url', $attribs );