summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/block/block.test25
-rw-r--r--modules/system/system.module5
2 files changed, 30 insertions, 0 deletions
diff --git a/modules/block/block.test b/modules/block/block.test
index 8f812e9c4..30f54f052 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -108,4 +108,29 @@ class BlockTestCase extends DrupalWebTestCase {
$this->drupalPost('admin/build/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => 'Navigation'), t('Save block'));
$this->assertText(t('The block configuration has been saved.'), t('Block title set.'));
}
+
+}
+
+class NonDefaultBlockAdmin extends DrupalWebTestCase {
+ /**
+ * Implementation of getInfo().
+ */
+ function getInfo() {
+ return array(
+ 'name' => t('Non default theme admin'),
+ 'description' => t('Check the administer page for non default theme.'),
+ 'group' => t('Block'),
+ );
+ }
+
+ /**
+ * Test non-default theme admin.
+ */
+ function testNnonDefaultBlockAdmin() {
+ $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer site configuration'));
+ $this->drupalLogin($admin_user);
+ $this->drupalPost('admin/build/themes', array('status[bluemarine]' => 1), t('Save configuration'));
+ $this->drupalGet('admin/build/block/list/bluemarine');
+ $this->assertRaw('bluemarine/style.css', t('Bluemarine CSS found'));
+ }
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 9b9791f0f..07a03db4b 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -692,7 +692,12 @@ function system_init() {
drupal_add_css(drupal_get_path('module', 'system') . '/defaults.css', 'module');
drupal_add_css(drupal_get_path('module', 'system') . '/system.css', 'module');
drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css', 'module');
+}
+/**
+ * Implementation of MODULE_preprocess_HOOK().
+ */
+function system_preprocess_page() {
// Get the major version
list($version,) = explode('.', VERSION);