Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.119 diff -u -p -r1.119 menu.inc --- includes/menu.inc 14 Apr 2006 22:16:02 -0000 1.119 +++ includes/menu.inc 20 Apr 2006 13:04:35 -0000 @@ -528,6 +528,13 @@ function menu_get_active_help() { * Returns an array of rendered menu items in the active breadcrumb trail. */ function menu_get_active_breadcrumb() { + global $is_front; + + // No breadcrumb for the front page. + if ($is_front) { + return array(); + } + $links[] = l(t('Home'), ''); $trail = _menu_get_active_trail(); Index: includes/path.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/path.inc,v retrieving revision 1.3 diff -u -p -r1.3 path.inc --- includes/path.inc 24 Jan 2006 08:18:26 -0000 1.3 +++ includes/path.inc 20 Apr 2006 13:04:36 -0000 @@ -14,11 +14,15 @@ * Initialize the $_GET['q'] variable to the proper normal path. */ function drupal_init_path() { + global $is_front; + if (!empty($_GET['q'])) { $_GET['q'] = drupal_get_normal_path(trim($_GET['q'], '/')); + $is_front = FALSE; } else { $_GET['q'] = drupal_get_normal_path(variable_get('site_frontpage', 'node')); + $is_front = TRUE; } } Index: themes/engines/phptemplate/phptemplate.engine =================================================================== RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v retrieving revision 1.32 diff -u -p -r1.32 phptemplate.engine --- themes/engines/phptemplate/phptemplate.engine 7 Apr 2006 15:32:17 -0000 1.32 +++ themes/engines/phptemplate/phptemplate.engine 20 Apr 2006 13:04:38 -0000 @@ -84,13 +84,13 @@ function _phptemplate_callback($hook, $v * A sequential array of variables passed to the theme function. */ function _phptemplate_default_variables($hook, $variables) { - global $theme; + global $theme, $sidebar_indicator, $is_front; static $count = array(); + $count[$hook] = isset($count[$hook]) && is_int($count[$hook]) ? $count[$hook] : 1; $variables['zebra'] = ($count[$hook] % 2) ? 'odd' : 'even'; $variables['id'] = $count[$hook]++; - global $sidebar_indicator; if ($hook == 'block') { $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'; @@ -110,10 +110,7 @@ function _phptemplate_default_variables( } // Tell all templates where they are located. $variables['directory'] = path_to_theme(); - - if (drupal_get_path_alias($_GET['q']) == variable_get('site_frontpage', 'node')) { - $variables['is_front'] = true; - } + $variables['is_front'] = $is_front; return $variables; } @@ -140,9 +137,10 @@ function phptemplate_features() { * into a pluggable template engine. */ function phptemplate_page($content) { + global $is_front; /* Set title and breadcrumb to declared values */ - if (drupal_get_path_alias($_GET['q']) == variable_get('site_frontpage', 'node')) { + if ($is_front) { $mission = filter_xss_admin(theme_get_setting('mission')); }