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

6 files changed, 6 insertions, 42 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();
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index a85807837..dec95356f 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -197,7 +197,7 @@
 
   </div></div> <!-- /#page, /#page-wrapper -->
 
-  <?php print $closure; ?>
+  <?php print $page_bottom; ?>
 
 </body>
 </html>
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index 8986270b2..774370035 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -161,26 +161,6 @@ function hook_exit($destination = NULL) {
 }
 
 /**
- * Insert closing HTML.
- *
- * This hook enables modules to insert HTML just before the \</body\> closing
- * tag of web pages. This is useful for adding JavaScript code to the footer
- * and for outputting debug information. It is not possible to add JavaScript
- * to the header at this point, and developers wishing to do so should use
- * hook_init() instead.
- *
- * @param $main
- *   Whether the current page is the front page of the site.
- * @return
- *   The HTML to be inserted.
- */
-function hook_footer($main = 0) {
-  if (variable_get('dev_query', 0)) {
-    return '<div style="clear:both;">' . devel_query_table() . '</div>';
-  }
-}
-
-/**
  * Perform necessary alterations to the JavaScript before it is presented on
  * the page.
  *
diff --git a/modules/system/system.module b/modules/system/system.module
index 1137cc087..25ee5f1fb 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1345,7 +1345,6 @@ function system_init() {
   }
 }
 
-
 /**
  * Implement MODULE_preprocess_HOOK().
  */
@@ -1836,6 +1835,7 @@ function _system_get_theme_data() {
         'highlight' => 'Highlighted content',
         'help' => 'Help',
         'page_top' => 'Page top',
+        'page_bottom' => 'Page bottom',
       ),
       'description' => '',
       'features' => array(
@@ -2015,6 +2015,7 @@ function system_system_info_alter(&$info, $file) {
   // Remove page-top from the blocks UI since it is reserved for modules to
   // populate from outside the blocks system.
   $info['regions_hidden'][] = 'page_top';
+  $info['regions_hidden'][] = 'page_bottom';
 }
 
 /**
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 94f4a8ded..16221026d 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -75,6 +75,6 @@
     </div> <!-- /#container -->
   </div> <!-- /#wrapper -->
 
-  <?php print $closure ?>
+  <?php print $page_bottom; ?>
   </body>
 </html>