Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.633 diff -u -p -r1.633 common.inc --- includes/common.inc 24 Apr 2007 13:53:10 -0000 1.633 +++ includes/common.inc 24 Apr 2007 18:35:03 -0000 @@ -2307,6 +2307,7 @@ function drupal_common_themes() { ), 'page' => array( 'arguments' => array('content' => NULL, 'show_blocks' => TRUE), + 'file' => 'page', ), 'maintenance_page' => array( 'arguments' => array('content' => NULL, 'messages' => TRUE), @@ -2334,6 +2335,7 @@ function drupal_common_themes() { ), 'node' => array( 'arguments' => array('node' => NULL, 'teaser' => FALSE, 'page' => FALSE), + 'file' => 'node', ), 'submenu' => array( 'arguments' => array('links' => NULL), @@ -2349,9 +2351,11 @@ function drupal_common_themes() { ), 'box' => array( 'arguments' => array('title' => NULL, 'content' => NULL, 'region' => 'main'), + 'file' => 'box', ), 'block' => array( 'arguments' => array('block' => NULL), + 'file' => 'block', ), 'mark' => array( 'arguments' => array('type' => MARK_NEW), Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.350 diff -u -p -r1.350 theme.inc --- includes/theme.inc 17 Apr 2007 07:19:38 -0000 1.350 +++ includes/theme.inc 24 Apr 2007 18:35:05 -0000 @@ -166,6 +166,32 @@ function _theme_process_registry(&$cache if (!isset($info['arguments']) && isset($cache[$hook])) { $result[$hook]['arguments'] = $cache[$hook]['arguments']; } + // Check for default _preprocess_ functions. Ensure arrayness. + if (!isset($info['preprocess functions']) || !is_array($info['preprocess functions'])) { + $info['preprocess functions'] = array(); + $prefix = ($type == 'module' ? 'template' : $name); + // It would be too much of a performance hit to let every module have + // a generic preprocess function; themes and theme engines can do that. + if ($type != 'module' && function_exists($prefix .'_preprocess')) { + $info['preprocess functions'][] = $prefix .'_preprocess'; + } + if (function_exists($prefix .'_preprocess_'. $hook)) { + $info['preprocess functions'][] = $prefix .'_preprocess_'. $hook; + } + // theme engines get an extra set. + if ($type == 'theme_engine') { + if (function_exists($prefix .'_engine_preprocess')) { + $info['preprocess functions'][] = $prefix .'_engine_preprocess'; + } + if (function_exists($prefix .'_engine_preprocess_'. $hook)) { + $info['preprocess functions'][] = $prefix .'_engine_preprocess_'. $hook; + } + } + } + if (isset($cache[$hook]['preprocess functions']) && is_array($cache[$hook]['preprocess functions']) && empty($cache[$hook]['override preprocess functions'])) { + $info['preprocess functions'] = array_merge($cache[$hook]['preprocess functions'], $info['preprocess functions']); + } + $result[$hook]['preprocess functions'] = $info['preprocess functions']; } $cache = array_merge($cache, $result); @@ -264,24 +290,30 @@ function list_theme_engines($refresh = F * applicable) and the theme. The following functions may be used to modify * the $variables array: * - * ENGINE_engine_variables(&$variables) + * ENGINE_engine_preprocess(&$variables) * This function should only be implemented by theme engines and is exists * so that the theme engine can set necessary variables. It is commonly * used to set global variables such as $directory and $is_front_page. - * ENGINE_engine_variables_HOOK(&$variables) + * ENGINE_engine_preprocess_HOOK(&$variables) * This is the same as the previous function, but is called only per hook. - * ENGINE_variables_HOOK(&$variables) - * ENGINE_variables(&$variables) + * ENGINE_preprocess_HOOK(&$variables) + * ENGINE_preprocess(&$variables) * This is meant to be used by themes that utilize a theme engine; as it is * good practice for these themes to use the theme engine's name for * their functions so that they may share code. In PHPTemplate, these * functions will appear in template.php - * THEME_variables_HOOK(&$variables) - * THEME_variables(&$variables) + * THEME_preprocess_HOOK(&$variables) + * THEME_preprocess(&$variables) * These functions are based upon the raw theme; they should primarily be * used by themes that do not use an engine or by themes that need small * changes to what has already been established in the theme engine version * of the function. + * template_preprocess(&$variables) + * This function will only be called for theme functions registered by + * the named module. In general it is preferred to use the following + * function if possible, but it may not always be the case. + * template_preprocess_HOOK(&$variables) + * This is the same as the previous function, but is called only per hook. * * There are two special variables that these hooks can set: * 'template_file' and 'template_files'. These will be merged together @@ -337,18 +369,10 @@ function theme() { // default render function and extension. $render_function = 'theme_render_template'; $extension = '.tpl.php'; - $variables_list = array(); // Run through the theme engine variables, if necessary global $theme_engine; if (isset($theme_engine)) { - // Call each of our variable override functions. We allow - // several to create cleaner code. - $variables_list[] = $theme_engine .'_engine_variables'; - $variables_list[] = $theme_engine .'_engine_variables_'. $hook; - $variables_list[] = $theme_engine .'_variables'; - $variables_list[] = $theme_engine .'_variables_'. $hook; - // If theme or theme engine is implementing this, it may have // a different extension and a different renderer. if ($hooks[$hook]['type'] != 'module') { @@ -362,17 +386,14 @@ function theme() { } } - // Add theme specific variable substitution: - global $theme; - $variables_list[] = $theme .'_variables'; - $variables_list[] = $theme .'_variables_'. $hook; - - // This construct ensures that we can keep a reference through - // call_user_func_array. - $args = array(&$variables, $hook); - foreach ($variables_list as $variables_function) { - if (function_exists($variables_function)) { - call_user_func_array($variables_function, $args); + if (isset($info['preprocess functions']) && is_array($info['preprocess functions'])) { + // This construct ensures that we can keep a reference through + // call_user_func_array. + $args = array(&$variables, $hook); + foreach ($info['preprocess functions'] as $preprocess_function) { + if (function_exists($preprocess_function)) { + call_user_func_array($preprocess_function, $args); + } } } @@ -655,56 +676,6 @@ function theme_placeholder($text) { } /** - * Return an entire Drupal page displaying the supplied content. - * - * @param $content - * A string to display in the main content area of the page. - * @return - * A string containing the entire HTML page. - */ -function theme_page($content) { - // Get blocks before so that they can alter the header (JavaScript, Stylesheets etc.) - $blocks = theme('blocks', 'all'); - - $output = "\n"; - $output .= ''; - $output .= ''; - $output .= ' '. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'Drupal')) .''; - $output .= drupal_get_html_head(); - $output .= drupal_get_css(); - $output .= drupal_get_js(); - - $output .= ' '; - $output .= ' '; - $output .= '
'; - - $output .= $blocks; - $output .= ''; - - $output .= theme('breadcrumb', drupal_get_breadcrumb()); - $output .= '

'. drupal_get_title() .'

'; - - if ($tabs = theme('menu_local_tasks')) { - $output .= $tabs; - } - - $output .= theme('help'); - - $output .= theme('status_messages'); - - $output .= "\n\n"; - $output .= $content; - $output .= drupal_get_feeds(); - $output .= "\n\n"; - - $output .= '
'; - $output .= theme('closure'); - $output .= ''; - - return $output; -} - -/** * Generate a themed maintenance page. * * Note: this function is not themable. @@ -955,66 +926,6 @@ function theme_help() { } /** - * Return a themed node. - * - * @param $node - * An object providing all relevant information for displaying a node: - * - $node->nid: The ID of the node. - * - $node->type: The content type (story, blog, forum...). - * - $node->title: The title of the node. - * - $node->created: The creation date, as a UNIX timestamp. - * - $node->teaser: A shortened version of the node body. - * - $node->body: The entire node contents. - * - $node->changed: The last modification date, as a UNIX timestamp. - * - $node->uid: The ID of the author. - * - $node->username: The username of the author. - * @param $teaser - * Whether to display the teaser only, as on the main page. - * @param $page - * Whether to display the node as a standalone page. If TRUE, do not display - * the title because it will be provided by the menu system. - * @return - * A string containing the node output. - */ -function theme_node($node, $teaser = FALSE, $page = FALSE) { - if (!$node->status) { - $output = '
'; - } - - if (module_exists('taxonomy')) { - $terms = taxonomy_link('taxonomy terms', $node); - } - - if ($page == 0) { - $output .= t('!title by !name', array('!title' => '

'. check_plain($node->title) .'

', '!name' => theme('username', $node))); - } - else { - $output .= t('by !name', array('!name' => theme('username', $node))); - } - - if (count($terms)) { - $output .= ' ('. theme('links', $terms) .')
'; - } - - if ($teaser && $node->teaser) { - $output .= $node->teaser; - } - else { - $output .= $node->body; - } - - if ($node->links) { - $output .= '
'. theme('links', $node->links) .'
'; - } - - if (!$node->status) { - $output .= '
'; - } - - return $output; -} - -/** * Return a themed submenu, typically displayed under the tabs. * * @param $links @@ -1183,29 +1094,6 @@ function theme_box($title, $content, $re } /** - * Return a themed block. - * - * You can style your blocks by defining .block (all blocks), - * .block-module (all blocks of module module), and - * \#block-module-delta (specific block of module module - * with delta delta) in your theme's CSS. - * - * @param $block - * An object populated with fields from the "blocks" database table - * ($block->module, $block->delta ...) and fields returned by - * module_block('view') ($block->subject, $block->content, ...). - * @return - * A string containing the block output. - */ -function theme_block($block) { - $output = "
module\" id=\"block-$block->module-$block->delta\">\n"; - $output .= "

$block->subject

\n"; - $output .= "
$block->content
\n"; - $output .= "
\n"; - return $output; -} - -/** * Return a themed marker, useful for marking new or updated * content. * @@ -1432,3 +1320,186 @@ function _theme_table_cell($cell, $heade return $output; } +/** + * Prepare the variables passed to the page.tpl.php template. Uses the arg() + * function to generate a series of page template files suggestions based on + * the current path. + */ +function template_preprocess_page(&$variables) { + /* Set title and breadcrumb to declared values */ + if (drupal_is_front_page()) { + $variables['mission'] = filter_xss_admin(theme_get_setting('mission')); + } + + /* Add favicon */ + if (theme_get_setting('toggle_favicon')) { + drupal_set_html_head(''); + } + + /** + * Populate sidebars. + */ + $variables['sidebar_left'] = NULL; + $variables['sidebar_right'] = NULL; + $layout = 'none'; + if ($variables['show_blocks']) { + global $sidebar_indicator; + /** + * Sidebar_indicator tells the block counting code to count sidebars separately. + */ + $sidebar_indicator = 'left'; + $variables['sidebar_left'] = theme('blocks', 'left'); + if ($variables['sidebar_left'] != '') { + $layout = 'left'; + } + + $sidebar_indicator = 'right'; + $variables['sidebar_right'] = theme('blocks', 'right'); + if ($variables['sidebar_right'] != '') { + $variables['layout'] = ($layout == 'left') ? 'both' : 'right'; + } + $sidebar_indicator = NULL; + } + $variables['layout'] = $layout; + + global $theme; + // Populate the rest of the regions. + $regions = system_region_list($theme); + // Load all region content assigned via blocks. + foreach (array_keys($regions) as $region) { + // Skip blocks in this region that have already been loaded. + // This pre-loading is necessary because phptemplate uses variable names different from + // the region names, e.g., 'sidebar_left' instead of 'left'. + if (!in_array($region, array('left', 'right', 'footer'))) { + isset($variables[$region]) ? $variables[$region] .= theme('blocks', $region) : $variables[$region] = theme('blocks', $region); + } + } + + // Construct page title + if (drupal_get_title()) { + $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); + } + else { + $head_title = array(variable_get('site_name', 'Drupal')); + if (variable_get('site_slogan', '')) { + $head_title[] = variable_get('site_slogan', ''); + } + } + $variables['head_title'] = implode(' | ', $head_title); + $variables['base_path'] = base_path(); + $variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb()); + $variables['closure'] = theme('closure'); + $variables['feed_icons'] = drupal_get_feeds(); + $variables['footer_message'] = filter_xss_admin(variable_get('site_footer', FALSE)) . "\n" . theme('blocks', 'footer'); + $variables['head'] = drupal_get_html_head(); + $variables['help'] = theme('help'); + $variables['language'] = $GLOBALS['language']; + $variables['logo'] = theme_get_setting('logo'); + $variables['messages'] = theme('status_messages'); + $variables['mission'] = isset($mission) ? $mission : ''; + $variables['primary_links'] = menu_primary_links(); + $variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''); + $variables['secondary_links'] = menu_secondary_links(); + $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); + $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); + $variables['css'] = drupal_add_css(); + $variables['styles'] = drupal_get_css(); + $variables['scripts'] = drupal_get_js(); + $variables['tabs'] = theme('menu_local_tasks'); + $variables['title'] = drupal_get_title(); + + if ((arg(0) == 'node') && is_numeric(arg(1))) { + $variables['node'] = node_load(arg(1)); + } + + // Build a list of suggested template files in order of specificity. One + // suggestion is made for every element of the current path, though + // numeric elements are not carried to subsequent suggestions. For example, + // http://www.example.com/node/1/edit would result in the following + // suggestions: + // + // page-node-edit.tpl.php + // page-node-1.tpl.php + // page-node.tpl.php + // page.tpl.php + $i = 0; + $suggestion = 'page'; + $suggestions = array(); + while ($arg = arg($i++)) { + $suggestions[] = $suggestion . '-' . $arg; + if (!is_numeric($arg)) { + $suggestion .= '-' . $arg; + } + } + if (drupal_is_front_page()) { + $suggestions[] = 'page-front'; + } + + if ($suggestions) { + $variables['template_files'] = $suggestions; + } +} + +/* + * Prepare the values passed to the theme_node function to be passed + * into standard template files. + */ +function template_preprocess_node(&$variables) { + $node = $variables['node']; + if (module_exists('taxonomy')) { + $variables['taxonomy'] = taxonomy_link('taxonomy terms', $node); + } + else { + $variables['taxonomy'] = array(); + } + + if ($variables['teaser'] && $node->teaser) { + $variables['content'] = $node->teaser; + } + elseif (isset($node->body)) { + $variables['content'] = $node->body; + } + else { + $variables['content'] = ''; + } + + $variables['date'] = format_date($node->created); + $variables['links'] = !empty($node->links) ? theme('links', $node->links, array('class' => 'links inline')) : ''; + $variables['name'] = theme('username', $node); + $variables['node_url'] = url('node/'. $node->nid); + $variables['terms'] = theme('links', $variables['taxonomy'], array('class' => 'links inline')); + $variables['title'] = check_plain($node->title); + + // Flatten the node object's member fields. + $variables = array_merge((array)$node, $variables); + + // Display info only on certain node types. + if (theme_get_setting('toggle_node_info_' . $node->type)) { + $variables['submitted'] = t('Submitted by !a on @b.', array('!a' => theme('username', $node), '@b' => format_date($node->created))); + $variables['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : ''; + } + else { + $variables['submitted'] = ''; + $variables['picture'] = ''; + } + + $variables['template_files'][] = 'node-'. $node->type; +} + +/** + * 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. + */ +function template_preprocess_block(&$variables) { + global $sidebar_indicator; + $count['block_counter'][$sidebar_indicator] = isset($count['block_counter'][$sidebar_indicator]) && is_int($count['block_counter'][$sidebar_indicator]) ? $count['block_counter'][$sidebar_indicator] : 1; + + $variables['block_zebra'] = ($count['block_counter'][$sidebar_indicator] % 2) ? 'odd' : 'even'; + + $variables['block_id'] = $count['block_counter'][$sidebar_indicator]++; + $variables['template_files'][] = 'block-' . $variables['block']->region; + $variables['template_files'][] = 'block-' . $variables['block']->module; + $variables['template_files'][] = 'block-' . $variables['block']->module .'-'. $variables['block']->delta; +} Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.539 diff -u -p -r1.539 comment.module --- modules/comment/comment.module 24 Apr 2007 18:23:48 -0000 1.539 +++ modules/comment/comment.module 24 Apr 2007 18:35:07 -0000 @@ -162,6 +162,7 @@ function comment_theme() { ), 'comment' => array( 'arguments' => array('comment' => NULL, 'links' => array()), + 'file' => 'comment.tpl.php', ), 'comment_folded' => array( 'arguments' => array('comment' => NULL), @@ -1811,15 +1812,23 @@ function comment_controls_submit($form_i } } -function theme_comment($comment, $links = array()) { - $output = '
'; - $output .= '
'. l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) .' '. theme('mark', $comment->new) ."
\n"; - $output .= '
'. t('by %a on %b', array('%a' => theme('username', $comment), '%b' => format_date($comment->timestamp))) ."
\n"; - $output .= '
'. $comment->comment .'
'; - $output .= theme('user_signature', $comment->signature); - $output .= '
'. theme('links', $links) .'
'; - $output .= '
'; - return $output; +/** + * Prepare values for comment.tpl.php + */ +function template_preprocess_comment(&$variables) { + $comment = $variables['comment']; + $variables['author'] = theme('username', $comment); + $variables['comment'] = $comment; + $variables['content'] = $comment->comment; + $variables['date'] = format_date($comment->timestamp); + $variables['links'] = isset($variables['links']) ? theme('links', $variables['links']) : ''; + $variables['new'] = $comment->new ? t('new') : ''; + $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : ''; + $variables['signature'] = $comment->signature; + $variables['submitted'] = t('Submitted by !a on @b.', + array('!a' => theme('username', $comment), + '@b' => format_date($comment->timestamp))); + $variables['title'] = l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")); } function theme_comment_folded($comment) { Index: modules/comment/comment.tpl.php =================================================================== RCS file: modules/comment/comment.tpl.php diff -N modules/comment/comment.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/comment/comment.tpl.php 24 Apr 2007 18:35:07 -0000 @@ -0,0 +1,25 @@ +
+ + +new) : ?> + + + + +

+ +
+ +
+ +
+ + +
+ +
+ +
+ + +
Index: modules/system/block.tpl.php =================================================================== RCS file: modules/system/block.tpl.php diff -N modules/system/block.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/block.tpl.php 24 Apr 2007 18:35:07 -0000 @@ -0,0 +1,8 @@ +
+ +subject): ?> +

subject ?>

+ + +
content ?>
+
Index: modules/system/box.tpl.php =================================================================== RCS file: modules/system/box.tpl.php diff -N modules/system/box.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/box.tpl.php 24 Apr 2007 18:35:07 -0000 @@ -0,0 +1,8 @@ +
+ + +

+ + +
+
Index: modules/node/node.tpl.php =================================================================== RCS file: modules/node/node.tpl.php diff -N modules/node/node.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/node/node.tpl.php 24 Apr 2007 18:35:07 -0000 @@ -0,0 +1,29 @@ +
+ + + + +

+ + +
+ + + + + + + +
+ +
+ +
+ + + +
\ No newline at end of file Index: modules/system/page.tpl.php =================================================================== RCS file: modules/system/page.tpl.php diff -N modules/system/page.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/page.tpl.php 24 Apr 2007 18:35:07 -0000 @@ -0,0 +1,60 @@ + + + + + <?php print $head_title ?> + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +

+
+ + + + +
+
+ + + + + Index: themes/engines/phptemplate/phptemplate.engine =================================================================== RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v retrieving revision 1.63 diff -u -p -r1.63 phptemplate.engine --- themes/engines/phptemplate/phptemplate.engine 17 Apr 2007 07:19:39 -0000 1.63 +++ themes/engines/phptemplate/phptemplate.engine 24 Apr 2007 18:35:07 -0000 @@ -14,18 +14,13 @@ function phptemplate_init($template) { } /** - * Implementation of hook_themes to tell Drupal what templates the engine + * Implementation of hook_theme to tell Drupal what templates the engine * and the current theme use. The $existing argument will contain hooks * pre-defined by Drupal so that we can use that information if * we need to. */ function phptemplate_theme($existing) { - $templates = array( - 'box' => array('file' => 'box'), - 'node' => array('file' => 'node'), - 'comment' => array('file' => 'comment'), - 'block' => array('file' => 'block'), - ); + $templates = array(); // Check for template overrides. $files = drupal_system_listing('\.tpl\.php$', path_to_theme(), 'name', 0); @@ -68,13 +63,12 @@ function phptemplate_templates($director * * Counts how many times certain hooks have been called. Sidebar left / right are special cases. * + * @param $variables + * A series of key-value value pairs. * @param $hook * The name of the theme function being executed. - * @param $variables - * A sequential array of variables passed to the theme function. */ -function phptemplate_engine_variables(&$variables, $hook) { - global $theme, $sidebar_indicator; +function phptemplate_engine_preprocess(&$variables, $hook) { static $count = array(); // Create variables so anything which is themed can be zebra striped automatically. @@ -86,208 +80,3 @@ function phptemplate_engine_variables(&$ $variables['directory'] = path_to_theme(); $variables['is_front'] = drupal_is_front_page(); } - -/** - * Prepare the variables passed to the page.tpl.php template Uses the arg() - * function to generate a series of page template files suggestions based on - * the current path. - */ -function phptemplate_engine_variables_page(&$variables) { - /* Set title and breadcrumb to declared values */ - if (drupal_is_front_page()) { - $variables['mission'] = filter_xss_admin(theme_get_setting('mission')); - } - - /* Add favicon */ - if (theme_get_setting('toggle_favicon')) { - drupal_set_html_head(''); - } - - /** - * Populate sidebars. - */ - $variables['sidebar_left'] = NULL; - $variables['sidebar_right'] = NULL; - $layout = 'none'; - if ($variables['show_blocks']) { - global $sidebar_indicator; - /** - * Sidebar_indicator tells the block counting code to count sidebars separately. - */ - $sidebar_indicator = 'left'; - $variables['sidebar_left'] = theme('blocks', 'left'); - if ($variables['sidebar_left'] != '') { - $layout = 'left'; - } - - $sidebar_indicator = 'right'; - $variables['sidebar_right'] = theme('blocks', 'right'); - if ($variables['sidebar_right'] != '') { - $variables['layout'] = ($layout == 'left') ? 'both' : 'right'; - } - $sidebar_indicator = NULL; - } - $variables['layout'] = $layout; - - global $theme; - // Populate the rest of the regions. - $regions = system_region_list($theme); - // Load all region content assigned via blocks. - foreach (array_keys($regions) as $region) { - // Skip blocks in this region that have already been loaded. - // This pre-loading is necessary because phptemplate uses variable names different from - // the region names, e.g., 'sidebar_left' instead of 'left'. - if (!in_array($region, array('left', 'right', 'footer'))) { - isset($variables[$region]) ? $variables[$region] .= theme('blocks', $region) : $variables[$region] = theme('blocks', $region); - } - } - - // Construct page title - if (drupal_get_title()) { - $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); - } - else { - $head_title = array(variable_get('site_name', 'Drupal')); - if (variable_get('site_slogan', '')) { - $head_title[] = variable_get('site_slogan', ''); - } - } - $variables['head_title'] = implode(' | ', $head_title); - $variables['base_path'] = base_path(); - $variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb()); - $variables['closure'] = theme('closure'); - $variables['feed_icons'] = drupal_get_feeds(); - $variables['footer_message'] = filter_xss_admin(variable_get('site_footer', FALSE)) . "\n" . theme('blocks', 'footer'); - $variables['head'] = drupal_get_html_head(); - $variables['help'] = theme('help'); - $variables['language'] = $GLOBALS['language']; - $variables['logo'] = theme_get_setting('logo'); - $variables['messages'] = theme('status_messages'); - $variables['mission'] = isset($mission) ? $mission : ''; - $variables['primary_links'] = menu_primary_links(); - $variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''); - $variables['secondary_links'] = menu_secondary_links(); - $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); - $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); - $variables['css'] = drupal_add_css(); - $variables['styles'] = drupal_get_css(); - $variables['scripts'] = drupal_get_js(); - $variables['tabs'] = theme('menu_local_tasks'); - $variables['title'] = drupal_get_title(); - - if ((arg(0) == 'node') && is_numeric(arg(1))) { - $variables['node'] = node_load(arg(1)); - } - - // Build a list of suggested template files in order of specificity. One - // suggestion is made for every element of the current path, though - // numeric elements are not carried to subsequent suggestions. For example, - // http://www.example.com/node/1/edit would result in the following - // suggestions: - // - // page-node-edit.tpl.php - // page-node-1.tpl.php - // page-node.tpl.php - // page.tpl.php - $i = 0; - $suggestion = 'page'; - $suggestions = array(); - while ($arg = arg($i++)) { - $suggestions[] = $suggestion . '-' . $arg; - if (!is_numeric($arg)) { - $suggestion .= '-' . $arg; - } - } - if (drupal_is_front_page()) { - $suggestions[] = 'page-front'; - } - - if ($suggestions) { - $variables['template_files'] = $suggestions; - } -} - -/* - * Prepare the values passed to the theme_node function to be passed - * into standard template files. - */ -function phptemplate_engine_variables_node(&$variables) { - $node = $variables['node']; - if (module_exists('taxonomy')) { - $variables['taxonomy'] = taxonomy_link('taxonomy terms', $node); - } - else { - $variables['taxonomy'] = array(); - } - - if ($variables['teaser'] && $node->teaser) { - $variables['content'] = $node->teaser; - } - elseif (isset($node->body)) { - $variables['content'] = $node->body; - } - else { - $variables['content'] = ''; - } - - $variables['date'] = format_date($node->created); - $variables['links'] = !empty($node->links) ? theme('links', $node->links, array('class' => 'links inline')) : ''; - $variables['name'] = theme('username', $node); - $variables['node_url'] = url('node/'. $node->nid); - $variables['terms'] = theme('links', $variables['taxonomy'], array('class' => 'links inline')); - $variables['title'] = check_plain($node->title); - - // Flatten the node object's member fields. - $variables = array_merge((array)$node, $variables); - - // Display info only on certain node types. - if (theme_get_setting('toggle_node_info_' . $node->type)) { - $variables['submitted'] = t('Submitted by !a on @b.', array('!a' => theme('username', $node), '@b' => format_date($node->created))); - $variables['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : ''; - } - else { - $variables['submitted'] = ''; - $variables['picture'] = ''; - } - - $variables['template_files'][] = 'node-'. $node->type; -} - -/** - * Prepare the values passed to the theme_comment function to be passed - * into a pluggable template engine. - */ -// function phptemplate_comment($comment, $links = 0) { -function phptemplate_engine_variables_comment(&$variables) { - $comment = $variables['comment']; - $variables['author'] = theme('username', $comment); - $variables['comment'] = $comment; - $variables['content'] = $comment->comment; - $variables['date'] = format_date($comment->timestamp); - $variables['links'] = isset($variables['links']) ? theme('links', $variables['links']) : ''; - $variables['new'] = $comment->new ? t('new') : ''; - $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : ''; - $variables['signature'] = $comment->signature; - $variables['submitted'] = t('Submitted by !a on @b.', - array('!a' => theme('username', $comment), - '@b' => format_date($comment->timestamp))); - $variables['title'] = l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")); -} - -/** - * 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. - */ -function phptemplate_engine_variables_block(&$variables) { - global $sidebar_indicator; - $count['block_counter'][$sidebar_indicator] = isset($count['block_counter'][$sidebar_indicator]) && is_int($count['block_counter'][$sidebar_indicator]) ? $count['block_counter'][$sidebar_indicator] : 1; - - $variables['block_zebra'] = ($count['block_counter'][$sidebar_indicator] % 2) ? 'odd' : 'even'; - - $variables['block_id'] = $count['block_counter'][$sidebar_indicator]++; - $variables['template_files'][] = 'block-' . $variables['block']->region; - $variables['template_files'][] = 'block-' . $variables['block']->module; - $variables['template_files'][] = 'block-' . $variables['block']->module .'-'. $variables['block']->delta; -} Index: themes/garland/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.9 diff -u -p -r1.9 template.php --- themes/garland/template.php 13 Apr 2007 08:56:59 -0000 1.9 +++ themes/garland/template.php 24 Apr 2007 18:35:07 -0000 @@ -55,7 +55,7 @@ function phptemplate_comment_wrapper($co /** * Override or insert PHPTemplate variables into the templates. */ -function phptemplate_variables_page(&$vars) { +function phptemplate_preprocess_page(&$vars) { if ($secondary = menu_secondary_local_tasks()) { $output = ''; $output .= "\n";