From 6b6ea89afa76e5b3e3161e1afcb0e5f6350099a9 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 28 Jul 2010 01:40:39 +0000
Subject: - Patch #850686 by Jacine, sun: renamed 'highlight' region to
 'highlighted' for consistency.

---
 modules/block/block.install  | 2 +-
 modules/system/page.tpl.php  | 4 ++--
 modules/system/system.module | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/block/block.install b/modules/block/block.install
index b9f1285bc..1a6ec333a 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -346,7 +346,7 @@ function block_update_7004() {
         'theme' => $theme,
         'status' => 1,
         'weight' => 0,
-        'region' => 'highlight',
+        'region' => 'highlighted',
         'visibility' => BLOCK_VISIBILITY_LISTED,
         'pages' => '<front>',
         'cache' => DRUPAL_NO_CACHE,
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index 2577f190a..ee3ac5786 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -55,7 +55,7 @@
  *
  * Regions:
  * - $page['help']: Dynamic help text, mostly for admin pages.
- * - $page['highlight']: Items for the highlighted content region.
+ * - $page['highlighted']: Items for the highlighted content region.
  * - $page['content']: The main content of the current page.
  * - $page['sidebar_first']: Items for the first sidebar.
  * - $page['sidebar_second']: Items for the second sidebar.
@@ -117,7 +117,7 @@
     <div id="main-wrapper"><div id="main" class="clearfix">
 
       <div id="content" class="column"><div class="section">
-        <?php if ($page['highlight']): ?><div id="highlight"><?php print render($page['highlight']); ?></div><?php endif; ?>
+        <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
         <a id="main-content"></a>
         <?php print render($title_prefix); ?>
         <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
diff --git a/modules/system/system.module b/modules/system/system.module
index f16927aa4..05eb78661 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2350,7 +2350,7 @@ function _system_rebuild_theme_data() {
       'content' => 'Content',
       'header' => 'Header',
       'footer' => 'Footer',
-      'highlight' => 'Highlighted content',
+      'highlighted' => 'Highlighted',
       'help' => 'Help',
       'page_top' => 'Page top',
       'page_bottom' => 'Page bottom',
-- 
cgit v1.2.3