diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/help/help.api.php | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/batch.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/help/help.api.php b/modules/help/help.api.php index d8ffbcbd7..83314e8fd 100644 --- a/modules/help/help.api.php +++ b/modules/help/help.api.php @@ -50,7 +50,7 @@ function hook_help($path, $arg) { switch ($path) { // Main module help for the block module case 'admin/help#block': - return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "first sidebar", "second sidebar", "featured", "content", "header", "footer", etc., and a block may appear in any one of these areas. The <a href="@blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/structure/block'))) . '</p>'; + return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The <a href="@blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/structure/block'))) . '</p>'; // Help for another path in the block module case 'admin/structure/block': diff --git a/modules/simpletest/tests/batch.test b/modules/simpletest/tests/batch.test index 82385c5e9..d8aeb468c 100644 --- a/modules/simpletest/tests/batch.test +++ b/modules/simpletest/tests/batch.test @@ -274,6 +274,7 @@ class BatchPageTestCase extends DrupalWebTestCase { function testBatchProgressPageTheme() { // Make sure that the page which starts the batch (an administrative page) // is using a different theme than would normally be used by the batch API. + variable_set('theme_default', 'bartik'); variable_set('admin_theme', 'seven'); // Visit an administrative page that runs a test batch, and check that the // theme that was used during batch execution (which the batch callback |