tonyair/silverstripe-docsviewer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-docsviewer synced 2024-10-22 11:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98 from webbuilders-group/remove-extension-fix

Browse Source 
BUGFIX: Fixed redirecting to strip extensions incorrectly redirecting
This commit is contained in:
Daniel Hensby 2016-02-22 11:28:05 +00:00
commit aca243bfe3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/DocumentationViewer.php
View File

@ -166,7 +166,7 @@ class DocumentationViewer extends Controller
if (DocumentationHelper::get_extension($url)) {
$this->response = new SS_HTTPResponse();
$this->response->redirect(
DocumentationHelper::trim_extension_off($url) .'/',
Director::absoluteURL(DocumentationHelper::trim_extension_off($url)) .'/',
301
);

13
tests/DocumentationViewerTest.php
View File

@ -217,4 +217,17 @@ class DocumentationViewerTest extends FunctionalTest
$response = $this->get('dev/docs/all/');
$this->assertEquals(404, $response->getStatusCode());
}
public function testRedirectStripExtension()
{
// get url with .md extension
$response = $this->get('dev/docs/en/doc_test/3.0/tutorials.md');
// response should be a 301 redirect
$this->assertEquals(301, $response->getStatusCode());
// redirect should have been to the absolute url minus the .md extension
$this->assertEquals(Director::absoluteURL('dev/docs/en/doc_test/3.0/tutorials/'), $response->getHeader('Location'));
}
}