mirror of
https://github.com/silverstripe/silverstripe-docsviewer
synced 2024-10-22 11:05:56 +02:00
Merge pull request #35 from sminnee/fix-opensearch-url-encoding
FIX: Fixed encoding of & in OpenSearchDescription URLs.
This commit is contained in:
commit
57546ef657
@ -27,10 +27,10 @@ class DocumentationOpenSearchController extends Controller {
|
||||
$link = Director::absoluteBaseUrl() .
|
||||
$data['SearchPageLink'] = Controller::join_links(
|
||||
$viewer->Link(),
|
||||
'results/?Search={searchTerms}&start={startIndex}&length={count}&action_results=1'
|
||||
'results/?Search={searchTerms}&start={startIndex}&length={count}&action_results=1'
|
||||
);
|
||||
|
||||
$data['SearchPageAtom'] = $data['SearchPageLink'] . '&format=atom';
|
||||
$data['SearchPageAtom'] = $data['SearchPageLink'] . '&format=atom';
|
||||
|
||||
return $this->customise(
|
||||
new ArrayData($data)
|
||||
|
@ -6,7 +6,7 @@
|
||||
<% if Tags %><Tags>$Tags</Tags><% end_if %>
|
||||
<% if Contact %><Contact>$Content</Contact><% end_if %>
|
||||
|
||||
<% if SearchPageLink %><Url type="text/html" template="$SearchPageLink"></Url><% end_if %>
|
||||
<% if SearchPageAtom %><Url type="application/atom+xml" template="$SearchPageAtom"></Url><% end_if %>
|
||||
<% if SearchPageJson %><Url type="application/x-suggestions+json" template="$SearchPageJson"></Url><% end_if %>
|
||||
<% if SearchPageLink %><Url type="text/html" template="$SearchPageLink.XML"></Url><% end_if %>
|
||||
<% if SearchPageAtom %><Url type="application/atom+xml" template="$SearchPageAtom.XML"></Url><% end_if %>
|
||||
<% if SearchPageJson %><Url type="application/x-suggestions+json" template="$SearchPageJson.XML"></Url><% end_if %>
|
||||
</OpenSearchDescription>
|
Loading…
Reference in New Issue
Block a user