From 3cb401bda18f6f026b510ed3901ea7042e59c84e Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 7 Dec 2005 14:59:55 +0000
Subject: [PATCH] - Patch #38645 by Morbus: reworked the _regions() hook.

---
 modules/system.module        | 33 ++++++++++++++++++---------------
 modules/system/system.module | 33 ++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/modules/system.module b/modules/system.module
index 60c6b750a27..c9b6b52146b 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -583,26 +583,29 @@ function system_region_list($theme_key) {
   static $list = array();
 
   if (!array_key_exists($theme_key, $list)) {
+    $theme = db_fetch_object(db_query("SELECT * FROM {system} WHERE type = 'theme' AND name = '%s'", $theme_key));
 
-    $result = db_query("SELECT * FROM {system} WHERE type = 'theme' AND name = '%s'", $theme_key);
-    $theme = db_fetch_object($result);
-
+    // Stylesheets can't have regions; use its theme.
     if (strpos($theme->filename, '.css')) {
-      // File is a style, which can't have its own regions; use its theme instead.
-      $list[$theme_key] = system_region_list(basename(dirname($theme->description)));
-      return $list[$theme_key];
-    }
-    if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) {
-    include_once "./$file";
+      return system_region_list(basename(dirname($theme->description)));
     }
 
-    $regions = function_exists($theme_key . '_regions') ? call_user_func($theme_key . '_regions') : array();
-    if (strpos($theme->description, '.engine')) {
-      // File is a template; include its engine's regions.
-    include_once './' . $theme->description;
+    // If this is a custom theme, load it in before moving on.
+    if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) {
+      include_once "./$file";
+    }
+
+    $regions = array();
+
+    // This theme has defined its own regions.
+    if (function_exists($theme_key . '_regions')) {
+      $regions = call_user_func($theme_key . '_regions');
+    }
+    // File is an engine; include its regions.
+    else if (strpos($theme->description, '.engine')) {
+      include_once './' . $theme->description;
       $theme_engine = basename($theme->description, '.engine');
-      $engine_regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array();
-      $regions = array_merge($engine_regions, $regions);
+      $regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array();
     }
 
     $list[$theme_key] = $regions;
diff --git a/modules/system/system.module b/modules/system/system.module
index 60c6b750a27..c9b6b52146b 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -583,26 +583,29 @@ function system_region_list($theme_key) {
   static $list = array();
 
   if (!array_key_exists($theme_key, $list)) {
+    $theme = db_fetch_object(db_query("SELECT * FROM {system} WHERE type = 'theme' AND name = '%s'", $theme_key));
 
-    $result = db_query("SELECT * FROM {system} WHERE type = 'theme' AND name = '%s'", $theme_key);
-    $theme = db_fetch_object($result);
-
+    // Stylesheets can't have regions; use its theme.
     if (strpos($theme->filename, '.css')) {
-      // File is a style, which can't have its own regions; use its theme instead.
-      $list[$theme_key] = system_region_list(basename(dirname($theme->description)));
-      return $list[$theme_key];
-    }
-    if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) {
-    include_once "./$file";
+      return system_region_list(basename(dirname($theme->description)));
     }
 
-    $regions = function_exists($theme_key . '_regions') ? call_user_func($theme_key . '_regions') : array();
-    if (strpos($theme->description, '.engine')) {
-      // File is a template; include its engine's regions.
-    include_once './' . $theme->description;
+    // If this is a custom theme, load it in before moving on.
+    if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) {
+      include_once "./$file";
+    }
+
+    $regions = array();
+
+    // This theme has defined its own regions.
+    if (function_exists($theme_key . '_regions')) {
+      $regions = call_user_func($theme_key . '_regions');
+    }
+    // File is an engine; include its regions.
+    else if (strpos($theme->description, '.engine')) {
+      include_once './' . $theme->description;
       $theme_engine = basename($theme->description, '.engine');
-      $engine_regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array();
-      $regions = array_merge($engine_regions, $regions);
+      $regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array();
     }
 
     $list[$theme_key] = $regions;