- Patch #519782 by tic2000: change to become a hidden region like page_top.

2 files changed, 2 insertions, 19 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 2a84bffd1..bca164c1f 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -4150,9 +4150,6 @@ function drupal_common_theme() {
     'more_link' => array(
       'arguments' => array('url' => NULL, 'title' => NULL)
     ),
-    'closure' => array(
-      'arguments' => array('main' => 0),
-    ),
     'blocks' => array(
       'arguments' => array('region' => NULL),
     ),
diff --git a/includes/theme.inc b/includes/theme.inc
index f8ba34f55..661d94e59 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1703,20 +1703,6 @@ function theme_more_link($url, $title) {
 }
 
 /**
- * Execute hook_footer() which is run at the end of the page right before the
- * close of the body tag.
- *
- * @param $main (optional)
- *   Whether the current page is the front page of the site.
- * @return
- *   A string containing the results of the hook_footer() calls.
- */
-function theme_closure($main = 0) {
-  $footer = module_invoke_all('footer', $main);
-  return implode("\n", $footer) . drupal_get_js('footer');
-}
-
-/**
  * Format a username.
  *
  * @param $object
@@ -1950,8 +1936,6 @@ function template_preprocess_page(&$variables) {
   // using an associated GRDDL profile.
   $variables['rdf_namespaces']    = drupal_get_rdf_namespaces();
   $variables['grddl_profile']     = 'http://ns.inria.fr/grddl/rdfa/';
-  // Closure should be filled last.
-  $variables['closure']           = theme('closure');
 
   if ($node = menu_get_object()) {
     $variables['node'] = $node;
@@ -2009,6 +1993,8 @@ function template_process_page(&$variables) {
   foreach (system_region_list($GLOBALS['theme']) as $region_key => $region_name) {
     $variables[$region_key] = drupal_render($variables['page'][$region_key]);
   }
+  // Append javascript to $page_bottom
+  $variables['page_bottom'] .= drupal_get_js('footer');
 
   $variables['head']    = drupal_get_html_head();
   $variables['css']     = drupal_add_css();