? sites/localhost.drupal
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.410
diff -u -F^f -r1.410 common.inc
--- includes/common.inc 3 Dec 2004 20:38:22 -0000 1.410
+++ includes/common.inc 4 Dec 2004 23:32:59 -0000
@@ -176,7 +176,8 @@ function drupal_not_found() {
}
if ($status != MENU_FOUND) {
- print theme('page', '', t('Page not found'));
+ drupal_set_title(t('Page not found'));
+ print theme('page', '');
}
}
@@ -195,7 +196,8 @@ function drupal_access_denied() {
}
if ($status != MENU_FOUND) {
- print theme('page', message_access(), t('Access denied'));
+ drupal_set_title(t('Access denied'));
+ print theme('page', message_access());
}
}
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.220
diff -u -F^f -r1.220 theme.inc
--- includes/theme.inc 1 Dec 2004 22:41:19 -0000 1.220
+++ includes/theme.inc 4 Dec 2004 23:33:01 -0000
@@ -337,23 +337,10 @@ function theme_get_styles() {
*
* @param $content
* A string to display in the main content area of the page.
- * @param $title
- * The title of the page, if different from that provided by the menu system.
- * @param $breadcrumb
- * The breadcrumb trail for the page, if different from that provided by the
- * menu system. Use menu_set_location() instead, if possible.
* @return
* A string containing the entire HTML page.
*/
-function theme_page($content, $title = NULL, $breadcrumb = NULL) {
- if (isset($title)) {
- drupal_set_title($title);
- }
-
- if (isset($breadcrumb)) {
- drupal_set_breadcrumb($breadcrumb);
- }
-
+function theme_page($content) {
$output = "\n";
$output .= '';
$output .= '';
Index: modules/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog.module,v
retrieving revision 1.206
diff -u -F^f -r1.206 blog.module
--- modules/blog.module 24 Nov 2004 22:56:21 -0000 1.206
+++ modules/blog.module 4 Dec 2004 23:33:01 -0000
@@ -141,7 +141,7 @@ function blog_page_user($uid) {
$account = user_load(array((is_numeric($uid) ? 'uid' : 'name') => $uid, 'status' => 1));
if ($account->uid) {
- $title = t("%name's blog", array('%name' => $account->name));
+ drupal_set_title($title = t("%name's blog", array('%name' => $account->name)));
if (($account->uid == $user->uid) && user_access('edit own blog')) {
$output = ''. l(t('Post new blog entry.'), "node/add/blog") .'';
@@ -165,7 +165,7 @@ function blog_page_user($uid) {
$output .= theme('xml_icon', url("blog/feed/$account->uid"));
drupal_set_html_head('uid") .'" />');
- print theme('page', $output, $title);
+ print theme('page', $output);
}
else {
drupal_not_found();
Index: modules/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book.module,v
retrieving revision 1.272
diff -u -F^f -r1.272 book.module
--- modules/book.module 24 Nov 2004 22:56:21 -0000 1.272
+++ modules/book.module 4 Dec 2004 23:33:01 -0000
@@ -291,7 +291,8 @@ function book_outline() {
$output .= form_submit(t('Add to book outline'));
}
- print theme('page', form($output), $node->title);
+ drupal_set_title($node->title);
+ print theme('page', form($output));
}
}
}
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.312
diff -u -F^f -r1.312 comment.module
--- modules/comment.module 2 Dec 2004 20:24:53 -0000 1.312
+++ modules/comment.module 4 Dec 2004 23:33:04 -0000
@@ -124,7 +124,7 @@ function comment_menu($may_cache) {
$access = user_access('post comments');
$items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'),
'callback' => 'comment_reply', 'access' => $access, 'type' => MENU_CALLBACK);
- $items[] = array('path' => 'comment/edit', 'title' => t('edit your comment'),
+ $items[] = array('path' => 'comment/edit', 'title' => t('edit comment'),
'callback' => 'comment_edit', 'access' => $access, 'type' => MENU_CALLBACK);
$items[] = array('path' => 'comment', 'title' => t('reply to comment'),
@@ -338,7 +338,10 @@ function comment_edit($cid) {
$comment = drupal_unpack($comment);
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
if (comment_access('edit', $comment)) {
- print theme('page', comment_preview(object2array($comment)), t('Edit comment'));
+ print theme('page', comment_preview(object2array($comment)));
+ }
+ else {
+ drupal_access_denied();
}
}
@@ -353,13 +356,15 @@ function comment_reply($nid, $pid = NULL
if ($_POST['op'] == t('Post comment')) {
$edit = $_POST['edit'];
comment_validate_form($edit);
- print theme('page', comment_post($edit), t('Post comment'));
+ drupal_set_title(t('Post comment'));
+ print theme('page', comment_post($edit));
return;
}
else if ($_POST['op'] == t('Preview comment')) {
$edit = $_POST['edit'];
comment_validate_form($edit);
- print theme('page', comment_preview($edit), t('Preview comment'));
+ drupal_set_title(t('Preview comment'));
+ print theme('page', comment_preview($edit));
return;
}
@@ -394,7 +399,8 @@ function comment_reply($nid, $pid = NULL
$output .= theme('box', t('Reply'), t('You are not authorized to view comments.'));
}
- print theme('page', $output, t('Add new comment'));
+ drupal_set_title(t('Add new comment'));
+ print theme('page', $output);
}
function comment_validate_form($edit) {
Index: modules/drupal.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal.module,v
retrieving revision 1.94
diff -u -F^f -r1.94 drupal.module
--- modules/drupal.module 30 Nov 2004 18:25:39 -0000 1.94
+++ modules/drupal.module 4 Dec 2004 23:33:04 -0000
@@ -199,7 +199,7 @@ function drupal_menu($may_cache) {
* Menu callback; print Drupal-authentication-specific information from user/help.
*/
function drupal_page_help() {
- print theme('page', drupal_help('user/help#drupal'), t('Drupal'));
+ print theme('page', drupal_help('user/help#drupal'));
}
/**
Index: modules/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter.module,v
retrieving revision 1.47
diff -u -F^f -r1.47 filter.module
--- modules/filter.module 29 Nov 2004 13:13:29 -0000 1.47
+++ modules/filter.module 4 Dec 2004 23:33:05 -0000
@@ -671,7 +671,7 @@ function filter_tips_long() {
else {
$output = theme('filter_tips', _filter_tips(-1, true));
}
- print theme('page', $output, t('Compose Tips'));
+ print theme('page', $output);
}
/**
Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.217
diff -u -F^f -r1.217 forum.module
--- modules/forum.module 24 Nov 2004 22:56:21 -0000 1.217
+++ modules/forum.module 4 Dec 2004 23:33:06 -0000
@@ -487,7 +487,8 @@ function forum_page($tid = 0) {
print theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
}
else {
- print theme('page', forum_help('admin/settings/forum'), t('Warning'));
+ drupal_set_title(t('Warning'));
+ print theme('page', forum_help('admin/settings/forum'));
}
}
@@ -501,7 +502,7 @@ function theme_forum_display($forums, $t
// forum list, topics list, topic browser and 'add new topic' link
$vocabulary = taxonomy_get_vocabulary(variable_get('forum_nav_vocabulary', ''));
- $title = $vocabulary->name;
+ drupal_set_title($title = $vocabulary->name);
// Breadcrumb navigation:
$breadcrumb = array();
@@ -554,11 +555,11 @@ function theme_forum_display($forums, $t
$output .= '';
}
else {
- $title = t('No forums defined');
+ drupal_set_title(t('No forums defined'));
$output = '';
}
- print theme('page', $output, $title);
+ print theme('page', $output);
}
/**
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.428
diff -u -F^f -r1.428 node.module
--- modules/node.module 2 Dec 2004 06:44:55 -0000 1.428
+++ modules/node.module 4 Dec 2004 23:33:08 -0000
@@ -1525,7 +1525,8 @@ function node_page() {
if (is_numeric(arg(1))) {
$node = node_load(array('nid' => arg(1)), $_GET['revision']);
if ($node->nid) {
- print theme('page', node_show($node, arg(2)), $node->title);
+ drupal_set_title($node->title);
+ print theme('page', node_show($node, arg(2)));
}
else {
drupal_not_found();
@@ -1534,17 +1535,20 @@ function node_page() {
break;
case t('Preview'):
$edit = node_validate($edit);
- print theme('page', node_preview($edit), t('Preview'));
+ drupal_set_title(t('Preview'));
+ print theme('page', node_preview($edit));
break;
case t('Submit'):
drupal_set_title(t('Submit'));
print theme('page', node_submit($edit));
break;
case t('Delete'):
- print theme('page', node_delete($edit), t('Delete'));
+ drupal_set_title(t('Delete'));
+ print theme('page', node_delete($edit));
break;
default:
- print theme('page', node_page_default(), '');
+ drupal_set_title('');
+ print theme('page', node_page_default());
}
}
Index: modules/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path.module,v
retrieving revision 1.51
diff -u -F^f -r1.51 path.module
--- modules/path.module 23 Nov 2004 22:20:41 -0000 1.51
+++ modules/path.module 4 Dec 2004 23:33:09 -0000
@@ -107,14 +107,14 @@ function path_admin_edit($pid = 0) {
}
elseif ($pid) {
$alias = path_load($pid);
- $title = $alias['dst'];
+ drupal_set_title($alias['dst']);
$output = path_form(path_load($pid));
}
else {
$output = path_form();
}
- print theme('page', $output, $title);
+ print theme('page', $output);
}
/**
Index: modules/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll.module,v
retrieving revision 1.151
diff -u -F^f -r1.151 poll.module
--- modules/poll.module 24 Nov 2004 22:56:21 -0000 1.151
+++ modules/poll.module 4 Dec 2004 23:33:09 -0000
@@ -357,7 +357,8 @@ function poll_view_results(&$node, $main
*/
function poll_results() {
if ($node = node_load(array('nid' => arg(1)))) {
- print theme('page', node_show($node, 0), $node->title);
+ drupal_set_title($node->title);
+ print theme('page', node_show($node, 0));
}
else {
drupal_not_found();
Index: modules/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile.module,v
retrieving revision 1.82
diff -u -F^f -r1.82 profile.module
--- modules/profile.module 21 Nov 2004 08:25:17 -0000 1.82
+++ modules/profile.module 4 Dec 2004 23:33:10 -0000
@@ -113,7 +113,8 @@ function profile_browse() {
}
$output .= '';
- print theme('page', $output, $title);
+ drupal_set_title($title);
+ print theme('page', $output);
}
else if ($name && !$field->id) {
drupal_not_found();
@@ -136,7 +137,8 @@ function profile_browse() {
$output .= '';
$output .= theme('pager', NULL, 20);
- print theme('page', $output, t('user list'));
+ drupal_set_title(t('user list'));
+ print theme('page', $output);
}
}
@@ -454,7 +456,8 @@ function profile_admin_add($type) {
$data = array('name' => 'profile_');
}
- print theme('page', _profile_field_form($type, $data), t('Add new %type', array('%type' => _profile_field_types($type))));
+ drupal_set_title(t('Add new %type', array('%type' => _profile_field_types($type))));
+ print theme('page', _profile_field_form($type, $data));
}
/**
@@ -481,7 +484,8 @@ function profile_admin_edit($fid) {
$data = db_fetch_array(db_query('SELECT * FROM {profile_fields} WHERE fid = %d', $fid));
}
- print theme('page', _profile_field_form($data['type'], $data), t('Edit %type', array('%type' => $data['type'])));
+ drupal_set_title(t('Edit %type', array('%type' => $data['type'])));
+ print theme('page', _profile_field_form($data['type'], $data));
}
/**
Index: modules/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search.module,v
retrieving revision 1.96
diff -u -F^f -r1.96 search.module
--- modules/search.module 2 Dec 2004 06:45:18 -0000 1.96
+++ modules/search.module 4 Dec 2004 23:33:11 -0000
@@ -500,7 +500,7 @@ function search_view() {
$output .= $results;
- print theme('page', $output, t('Search'));
+ print theme('page', $output);
}
else {
drupal_access_denied();
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.179
diff -u -F^f -r1.179 statistics.module
--- modules/statistics.module 29 Nov 2004 09:31:28 -0000 1.179
+++ modules/statistics.module 4 Dec 2004 23:33:11 -0000
@@ -184,7 +184,8 @@ function statistics_node_tracker() {
$rows[] = array(array('data' => $pager, 'colspan' => '4'));
}
- print theme('page', theme('table', $header, $rows), $node->title);
+ drupal_set_title($node->title);
+ print theme('page', theme('table', $header, $rows));
}
else {
drupal_not_found();
@@ -211,7 +212,8 @@ function statistics_user_tracker() {
$rows[] = array(array('data' => $pager, 'colspan' => '3'));
}
- print theme('page', theme('table', $header, $rows), $account->name);
+ drupal_set_title($account->name);
+ print theme('page', theme('table', $header, $rows));
}
else {
drupal_not_found();
@@ -222,7 +224,6 @@ function statistics_user_tracker() {
* Menu callback; presents the "Recent hits" page.
*/
function statistics_recent_hits($type = 'all', $id = 0) {
-
$header = array(
array('data' => t('Timestamp'), 'field' => 'a.timestamp', 'sort' => 'desc'),
array('data' => t('Page'), 'field' => 'a.path'),
@@ -245,7 +246,7 @@ function statistics_recent_hits($type =
$rows[] = array(array('data' => $pager, 'colspan' => '4'));
}
- print theme('page', theme('table', $header, $rows), t('Recent hits'));
+ print theme('page', theme('table', $header, $rows));
}
/**
@@ -269,7 +270,8 @@ function statistics_top_pages() {
$rows[] = array(array('data' => $pager, 'colspan' => '2'));
}
- print theme('page', theme('table', $header, $rows), t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+ drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+ print theme('page', theme('table', $header, $rows));
}
/**
@@ -294,7 +296,8 @@ function statistics_top_users() {
$rows[] = array(array('data' => $pager, 'colspan' => '2'));
}
- print theme('page', theme('table', $header, $rows), t('Top users in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+ drupal_set_title(t('Top users in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+ print theme('page', theme('table', $header, $rows));
}
/**
@@ -303,7 +306,7 @@ function statistics_top_users() {
function statistics_top_referrers() {
$query = "SELECT url, COUNT(url) AS hits, MAX(timestamp) AS last FROM {accesslog} WHERE url NOT LIKE '%". db_escape_string($_SERVER['HTTP_HOST']) ."%' AND url <> '' GROUP BY url";
$query_cnt = "SELECT COUNT(DISTINCT(url)) FROM {accesslog} WHERE url <> '' AND url NOT LIKE '%". db_escape_string($_SERVER['HTTP_HOST']) ."%'";
- $title = t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))));
+ drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
$header = array(
array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
@@ -321,7 +324,7 @@ function statistics_top_referrers() {
$rows[] = array(array('data' => $pager, 'colspan' => '3'));
}
- print theme('page', theme('table', $header, $rows), $title);
+ print theme('page', theme('table', $header, $rows));
}
/**
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.160
diff -u -F^f -r1.160 taxonomy.module
--- modules/taxonomy.module 29 Nov 2004 12:52:44 -0000 1.160
+++ modules/taxonomy.module 4 Dec 2004 23:33:13 -0000
@@ -906,7 +906,7 @@ function taxonomy_term_page($str_tids =
while ($term = db_fetch_object($result)) {
$names[] = $term->name;
}
- $title = implode(', ', $names);
+ drupal_set_title($title = implode(', ', $names));
switch ($op) {
case 'page':
@@ -924,7 +924,7 @@ function taxonomy_term_page($str_tids =
$output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
$output .= theme('xml_icon', url("taxonomy/term/$str_tids/$depth/feed"));
- print theme('page', $output, $title);
+ print theme('page', $output);
break;
case 'feed':
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.420
diff -u -F^f -r1.420 user.module
--- modules/user.module 29 Nov 2004 17:52:35 -0000 1.420
+++ modules/user.module 4 Dec 2004 23:33:16 -0000
@@ -1170,7 +1170,8 @@ function user_edit($category = 'account'
}
$output = form($output, 'post', 0, array('enctype' => 'multipart/form-data'));
- print theme('page', $output, $account->name);
+ drupal_set_title($account->name);
+ print theme('page', $output);
}
function user_view($uid = 0) {
@@ -1187,7 +1188,8 @@ function user_view($uid = 0) {
}
}
- print theme('page', theme('user_profile', $account, $fields), $account->name);
+ drupal_set_title($account->name);
+ print theme('page', theme('user_profile', $account, $fields));
}
else {
drupal_not_found();
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.23
diff -u -F^f -r1.23 chameleon.theme
--- themes/chameleon/chameleon.theme 23 Nov 2004 23:11:59 -0000 1.23
+++ themes/chameleon/chameleon.theme 4 Dec 2004 23:33:16 -0000
@@ -15,15 +15,7 @@ function chameleon_features() {
'toggle_secondary_links');
}
-function chameleon_page($content, $title = NULL, $breadcrumb = NULL) {
- if (isset($title)) {
- drupal_set_title($title);
- }
-
- if (isset($breadcrumb)) {
- drupal_set_breadcrumb($breadcrumb);
- }
-
+function chameleon_page($content) {
$language = $GLOBALS['locale'];
$output = "\n";
Index: themes/engines/xtemplate/xtemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/xtemplate/xtemplate.engine,v
retrieving revision 1.9
diff -u -F^f -r1.9 xtemplate.engine
--- themes/engines/xtemplate/xtemplate.engine 24 Nov 2004 22:44:01 -0000 1.9
+++ themes/engines/xtemplate/xtemplate.engine 4 Dec 2004 23:33:16 -0000
@@ -109,14 +109,7 @@ function xtemplate_comment($comment, $li
return $output;
}
-function xtemplate_page($content, $title = NULL, $breadcrumb = NULL) {
- if (isset($title)) {
- drupal_set_title($title);
- }
- if (isset($breadcrumb)) {
- drupal_set_breadcrumb($breadcrumb);
- }
-
+function xtemplate_page($content) {
global $xtemplate;
$xtemplate->template->assign(array(