? modules/trigger Index: modules/filter/filter.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v retrieving revision 1.2 diff -u -p -r1.2 filter.admin.inc --- modules/filter/filter.admin.inc 17 Sep 2007 09:16:48 -0000 1.2 +++ modules/filter/filter.admin.inc 19 Sep 2007 00:43:40 -0000 @@ -74,16 +74,13 @@ function theme_filter_admin_overview($fo } /** - * Display a filter format form. + * Menu callback; Display a filter format form. */ function filter_admin_format_page($format = NULL) { if (!isset($format->name)) { drupal_set_title(t("Add input format")); $format = (object)array('name' => '', 'roles' => '', 'format' => ''); } - else { - drupal_set_title(t("%format input format", array('%format' => $format->name))); - } return drupal_get_form('filter_admin_format_form', $format); } Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.188 diff -u -p -r1.188 filter.module --- modules/filter/filter.module 17 Sep 2007 09:16:48 -0000 1.188 +++ modules/filter/filter.module 19 Sep 2007 00:43:40 -0000 @@ -108,6 +108,8 @@ function filter_menu() { ); $items['admin/settings/filters/%filter_format'] = array( 'type' => MENU_CALLBACK, + 'title callback' => 'filter_admin_format_title', + 'title arguments' => array(3), 'page callback' => 'filter_admin_format_page', 'page arguments' => array(3), 'access arguments' => array('administer filters'), @@ -144,6 +146,13 @@ function filter_format_load($arg) { } /** + * Display a filter format form title.. + */ +function filter_admin_format_title($format) { + return $format->name; +} + +/** * Implementation of hook_perm(). */ function filter_perm() { Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.882 diff -u -p -r1.882 node.module --- modules/node/node.module 14 Sep 2007 09:37:29 -0000 1.882 +++ modules/node/node.module 19 Sep 2007 00:43:40 -0000 @@ -1393,7 +1393,7 @@ function node_menu() { ); } $items['node/%node'] = array( - 'title' => 'View', + 'title' => 'Content', 'page callback' => 'node_page_view', 'page arguments' => array(1), 'access callback' => 'node_access', Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.848 diff -u -p -r1.848 user.module --- modules/user/user.module 14 Sep 2007 17:38:08 -0000 1.848 +++ modules/user/user.module 19 Sep 2007 00:43:40 -0000 @@ -1005,7 +1005,8 @@ function user_menu() { ); $items['user/%user_current'] = array( - 'title' => 'My account', + 'title callback' => 'user_page_title', + 'title arguments' => array(1), 'page callback' => 'user_view', 'page arguments' => array(1), 'access callback' => 'user_view_access', @@ -1081,6 +1082,22 @@ function user_current_to_arg($arg) { return $GLOBALS['user']->uid; } +function user_page_title($account) { + if ($account->uid == $GLOBALS['user']->uid) { + return t('My account'); + } + else { + // Shorten the name when it is too long or it will break many tables. + if (drupal_strlen($account->name) > 20) { + $name = drupal_substr($account->name, 0, 15) .'...'; + } + else { + $name = $account->name; + } + return $name; + } +} + /** * Accepts an user object, $account, or a DA name and returns an associative * array of modules and DA names. Called at external login. Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.207 diff -u -p -r1.207 menu.inc --- includes/menu.inc 10 Sep 2007 12:21:30 -0000 1.207 +++ includes/menu.inc 19 Sep 2007 00:43:41 -0000 @@ -540,7 +540,7 @@ function _menu_link_translate(&$item) { _menu_check_access($item, $map); } // If the link title matches that of a router item, localize it. - if (!empty($item['title']) && (($item['title'] == $item['link_title']) || ($item['title_callback'] != 't'))) { + if ((!empty($item['title']) && ($item['title'] == $item['link_title'])) || (!empty($item['title_callback']) && $item['title_callback'] != 't')) { _menu_item_localize($item, $map); } else {