Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#321063 by eMPee584, Kars-T: Fixed book/export/html/N with a non-book nid should abort and return 404 not found.

merge-requests/26/head
Angie Byron 2011-01-28 08:04:59 +00:00
parent 2748d654c4
commit d21d640113
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/book/book.pages.inc
View File

@ -77,9 +77,11 @@ function book_export_html($nid) {
if (isset($node->book)) {
$tree = book_menu_subtree_data($node->book);
$contents = book_export_traverse($tree, 'book_node_export');
return theme('book_export_html', array('title' => $node->title, 'contents' => $contents, 'depth' => $node->book['depth']));
}
else {
drupal_not_found();
}
return theme('book_export_html', array('title' => $node->title, 'contents' => $contents, 'depth' => $node->book['depth']));
}
else {
drupal_access_denied();

4
modules/book/book.test
View File

@ -237,6 +237,10 @@ class BookTestCase extends DrupalWebTestCase {
$this->drupalGet('book/export/foobar/' . $this->book->nid);
$this->assertResponse('404', t('Unsupported export format returned "not found".'));
// Make sure we get a 404 on a not existing book node.
$this->drupalGet('book/export/html/123');
$this->assertResponse('404', t('Not existing book node returned "not found".'));
// Make sure an anonymous user cannot view printer-friendly version.
$this->drupalLogout();