Commit edb97527 authored by webchick's avatar webchick

#369409 by dropcube: Move block.tpl.php to block.module rather than system.module.

parent cf9f223c
...@@ -3631,10 +3631,6 @@ function drupal_common_theme() { ...@@ -3631,10 +3631,6 @@ function drupal_common_theme() {
'arguments' => array('title' => NULL, 'content' => NULL, 'region' => 'main'), 'arguments' => array('title' => NULL, 'content' => NULL, 'region' => 'main'),
'template' => 'box', 'template' => 'box',
), ),
'block' => array(
'arguments' => array('block' => NULL),
'template' => 'block',
),
'mark' => array( 'mark' => array(
'arguments' => array('type' => MARK_NEW), 'arguments' => array('type' => MARK_NEW),
), ),
......
...@@ -2027,35 +2027,3 @@ function template_preprocess_node(&$variables) { ...@@ -2027,35 +2027,3 @@ function template_preprocess_node(&$variables) {
$variables += field_attach_preprocess('node', $node); $variables += field_attach_preprocess('node', $node);
} }
/**
* Process variables for block.tpl.php
*
* Prepare the values passed to the theme_block function to be passed
* into a pluggable template engine. Uses block properties to generate a
* series of template file suggestions. If none are found, the default
* block.tpl.php is used.
*
* Most themes utilize their own copy of block.tpl.php. The default is located
* inside "modules/system/block.tpl.php". Look in there for the full list of
* variables.
*
* The $variables array contains the following arguments:
* - $block
*
* @see block.tpl.php
*/
function template_preprocess_block(&$variables) {
static $block_counter = array();
$variables['block'] = $variables['block']['#block'];
// All blocks get an independent counter for each region.
if (!isset($block_counter[$variables['block']->region])) {
$block_counter[$variables['block']->region] = 1;
}
// Same with zebra striping.
$variables['block_zebra'] = ($block_counter[$variables['block']->region] % 2) ? 'odd' : 'even';
$variables['block_id'] = $block_counter[$variables['block']->region]++;
$variables['template_files'][] = 'block-' . $variables['block']->region;
$variables['template_files'][] = 'block-' . $variables['block']->module;
$variables['template_files'][] = 'block-' . $variables['block']->module . '-' . $variables['block']->delta;
}
...@@ -92,6 +92,10 @@ function block_help($path, $arg) { ...@@ -92,6 +92,10 @@ function block_help($path, $arg) {
*/ */
function block_theme() { function block_theme() {
return array( return array(
'block' => array(
'arguments' => array('block' => NULL),
'template' => 'block',
),
'block_admin_display_form' => array( 'block_admin_display_form' => array(
'template' => 'block-admin-display-form', 'template' => 'block-admin-display-form',
'file' => 'block.admin.inc', 'file' => 'block.admin.inc',
...@@ -728,3 +732,36 @@ function _block_get_cache_id($block) { ...@@ -728,3 +732,36 @@ function _block_get_cache_id($block) {
function block_flush_caches() { function block_flush_caches() {
return array('cache_block'); return array('cache_block');
} }
/**
* Process variables for block.tpl.php
*
* Prepare the values passed to the theme_block function to be passed
* into a pluggable template engine. Uses block properties to generate a
* series of template file suggestions. If none are found, the default
* block.tpl.php is used.
*
* Most themes utilize their own copy of block.tpl.php. The default is located
* inside "modules/block/block.tpl.php". Look in there for the full list of
* variables.
*
* The $variables array contains the following arguments:
* - $block
*
* @see block.tpl.php
*/
function template_preprocess_block(&$variables) {
static $block_counter = array();
$variables['block'] = $variables['block']['#block'];
// All blocks get an independent counter for each region.
if (!isset($block_counter[$variables['block']->region])) {
$block_counter[$variables['block']->region] = 1;
}
// Same with zebra striping.
$variables['block_zebra'] = ($block_counter[$variables['block']->region] % 2) ? 'odd' : 'even';
$variables['block_id'] = $block_counter[$variables['block']->region]++;
$variables['template_files'][] = 'block-' . $variables['block']->region;
$variables['template_files'][] = 'block-' . $variables['block']->module;
$variables['template_files'][] = 'block-' . $variables['block']->module . '-' . $variables['block']->delta;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment