Merge pull request #2 from nyeholt/master

This commit is contained in:
Will Rossiter 2011-07-24 21:42:21 -07:00
commit 37ea520c8b
2 changed files with 2 additions and 2 deletions

View File

@ -265,7 +265,7 @@ class DocumentationService {
if($dir && !$ignored) {
// 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)) {
self::register($entity, $docs, '', $entity, true);

View File

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