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

Merge branch 'master' of github.com:silverstripe/silverstripe-sapphiredocs

Browse Source
This commit is contained in:
Will Rossiter 2011-08-02 15:31:38 +12:00
commit 0ba6d8d338
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/DocumentationService.php
View File

@ -265,7 +265,7 @@ class DocumentationService {
if($dir && !$ignored) { if($dir && !$ignored) {
// check to see if it has docs // check to see if it has docs
$docs = Controller::join_links($dir, 'docs'); $docs = Director::baseFolder() . '/' . Controller::join_links($entity, 'docs');
if(is_dir($docs)) { if(is_dir($docs)) {
self::register($entity, $docs, '', $entity, true); self::register($entity, $docs, '', $entity, true);

2
code/controllers/DocumentationViewer.php
View File

@ -754,7 +754,7 @@ class DocumentationViewer extends Controller {
$form = new Form($this, 'DocumentationSearchForm', $fields, $actions); $form = new Form($this, 'DocumentationSearchForm', $fields, $actions);
$form->disableSecurityToken(); $form->disableSecurityToken();
$form->setFormMethod('get'); $form->setFormMethod('get');
$form->setFormAction('home/DocumentationSearchForm'); $form->setFormAction(self::$link_base . 'DocumentationSearchForm');
return $form; return $form;
} }