tonyair
/
silverstripe-docsviewer
mirror of https://github.com/silverstripe/silverstripe-docsviewer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX: Fixed encoding of & in OpenSearchDescription URLs. 

Without this fix, the & was then passed to urlencode(), which escaped the ; and make invalid
XML.  This keeps XML out of the source URL (so the & is just a raw & in the code) and relies on
the template engine to escape XML as needed (the .XML on the end of the variables).
This commit is contained in:
Sam Minnee 2014-02-14 09:38:37 +13:00
parent e3c417113b
commit b6b753ee4c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/DocumentationOpenSearchController.php
View File

@ -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
templates/OpenSearchDescription.ss
View File

@ -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>