From 6c0f8eba1c55b01e8dc3122f67cda34308ba94a2 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Tue, 15 Sep 2009 17:10:39 +0000 Subject: #469242 by tic2000, Pasqualle, pwolanin, Nick Lewis, moshe weitzman, Rob Loach, and alexanderpas: page.tpl.php has now been split into html.tpl.php (for , , and ) and page.tpl.php (for page content). This now provides consistency for granular theming of renderable output in all template files. --- modules/simpletest/tests/theme.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/simpletest') diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test index 805d85510..29fc445c7 100644 --- a/modules/simpletest/tests/theme.test +++ b/modules/simpletest/tests/theme.test @@ -26,17 +26,17 @@ class TemplateUnitTest extends DrupalWebTestCase { // test runner fails. variable_set('site_frontpage', 'nobody-home'); $args = array('node', '1', 'edit'); - $suggestions = template_page_suggestions($args); + $suggestions = template_page_suggestions($args, 'page'); $this->assertEqual($suggestions, array('page-node', 'page-node-%', 'page-node-1', 'page-node-edit'), t('Found expected node edit page template suggestions')); // Check attack vectors. $args = array('node', '\\1'); - $suggestions = template_page_suggestions($args); + $suggestions = template_page_suggestions($args, 'page'); $this->assertEqual($suggestions, array('page-node', 'page-node-%', 'page-node-1'), t('Removed invalid \\ from template suggestions')); $args = array('node', '1/'); - $suggestions = template_page_suggestions($args); + $suggestions = template_page_suggestions($args, 'page'); $this->assertEqual($suggestions, array('page-node', 'page-node-%', 'page-node-1'), t('Removed invalid / from template suggestions')); $args = array('node', "1\0"); - $suggestions = template_page_suggestions($args); + $suggestions = template_page_suggestions($args, 'page'); $this->assertEqual($suggestions, array('page-node', 'page-node-%', 'page-node-1'), t('Removed invalid \\0 from template suggestions')); // Tests for drupal_discover_template() $suggestions = array('page'); -- cgit v1.2.3