Skip to content

GitLab

D
drupal
Commit 83f5d828 authored by Dries's avatar Dries
Browse files
Options 

- Everything is using theme("function") now instead of $theme->function().
parent d0387297
Hide whitespace changes
Inline Side-by-side
Showing with 496 additions and 514 deletions
index.php
View file @ 83f5d828
......@@ -26,8 +26,8 @@
module_invoke(variable_get("site_frontpage", "node"), "page");
}
else {
$theme->header();
$theme->footer();
theme("header");
theme("footer");
}
page_footer();
......
modules/aggregator.module
View file @ 83f5d828
......@@ -60,10 +60,10 @@ function import_update() {
}
function import_format_item($item, $feed = 0) {
global $theme, $user;
global $user;
if ($user->uid && user_access("maintain personal blog")) {
$output .= l("<img src=\"". $theme->image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
$output .= l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
}
// external link
......@@ -503,7 +503,7 @@ function import_admin() {
}
function import_page_info() {
global $theme;
$links[] = l(t("latest news"), "import", array("title" => t("Read the latest news from syndicated websites.")));
$links[] = l(t("news by source"), "import/feeds", array("title" => t("View the latest headlines sorted by source.")));
......@@ -514,11 +514,11 @@ function import_page_info() {
$links[] = l(t("administer news feeds"), "admin/import", array("title" => t("View the news feed administrative pages.")));
}
return "<div align=\"center\">". $theme->links($links) ."</div>";
return "<div align=\"center\">". theme("links", $links) ."</div>";
}
function import_page_last() {
global $theme;
$result = db_query("SELECT i.*, f.title AS ftitle, f.link AS flink FROM item i LEFT JOIN feed f ON i.fid = f.fid ORDER BY i.iid DESC LIMIT ". variable_get("import_page_limit", 75));
......@@ -530,7 +530,7 @@ function import_page_last() {
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
if ($item->link) {
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". $theme->links($links) ."</td></tr>\n";
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
......@@ -541,20 +541,20 @@ function import_page_last() {
}
$output .= "</table>\n";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(t("Latest news"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", t("Latest news"), $output);
theme("footer");
}
function import_page_feed($fid) {
global $theme;
$feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%s'", $fid));
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">$feed->description</div></p>";
$header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
$header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
$result = db_query("SELECT * FROM item WHERE fid = '%s' ORDER BY iid DESC LIMIT ". variable_get("import_page_limit", 75), $fid);
......@@ -566,7 +566,7 @@ function import_page_feed($fid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
$output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". $theme->links($links) ."</td></tr>\n";
$output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
......@@ -576,15 +576,15 @@ function import_page_feed($fid) {
}
$output .= "</table>\n";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box($feed->title, $header);
$theme->box(t("Latest news"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", $feed->title, $header);
theme("box", t("Latest news"), $output);
theme("footer");
}
function import_page_bundle($bid) {
global $theme;
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid));
......@@ -604,7 +604,7 @@ function import_page_bundle($bid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". $theme->links($links) ."</td></tr>\n";
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
......@@ -615,16 +615,16 @@ function import_page_bundle($bid) {
}
$output .= "</table>\n";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box($bundle->title, $header);
$theme->box(t("Latest news"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", $bundle->title, $header);
theme("box", t("Latest news"), $output);
theme("footer");
}
function import_page_sources() {
global $theme;
$result = db_query("SELECT * FROM feed ORDER BY title");
......@@ -633,12 +633,12 @@ function import_page_sources() {
$output .= "<div style=\"margin-left: 20px;\">$feed->description</div><br />";
}
$output .= l("<img src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated websites in XML format."))) ."<br />";
$output .= l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated websites in XML format."))) ."<br />";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(t("News sources"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", t("News sources"), $output);
theme("footer");
}
function import_page_fd() {
......@@ -671,10 +671,10 @@ function import_page_feeds() {
}
function import_page_blocks($blocks) {
global $theme;
$theme->header();
$theme->box(t("News feeds"), import_page_info());
theme("header");
theme("box", t("News feeds"), import_page_info());
print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" width=\"100%\">\n";
print " <tr>\n";
......@@ -682,7 +682,7 @@ function import_page_blocks($blocks) {
$i = 1;
print " <td width=\"33%\" valign=\"top\">\n";
while ($block = each($blocks)) {
$theme->box($block["value"]["subject"], $block["value"]["content"]);
theme("box", $block["value"]["subject"], $block["value"]["content"]);
if ($i == ceil(count($blocks) / 3)) {
break;
}
......@@ -693,7 +693,7 @@ function import_page_blocks($blocks) {
print " </tr>\n";
print "</table>\n";
$theme->footer();
theme("footer");
}
function import_page() {
......
modules/aggregator/aggregator.module
View file @ 83f5d828
......@@ -60,10 +60,10 @@ function import_update() {
}
function import_format_item($item, $feed = 0) {
global $theme, $user;
global $user;
if ($user->uid && user_access("maintain personal blog")) {
$output .= l("<img src=\"". $theme->image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
$output .= l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
}
// external link
......@@ -503,7 +503,7 @@ function import_admin() {
}
function import_page_info() {
global $theme;
$links[] = l(t("latest news"), "import", array("title" => t("Read the latest news from syndicated websites.")));
$links[] = l(t("news by source"), "import/feeds", array("title" => t("View the latest headlines sorted by source.")));
......@@ -514,11 +514,11 @@ function import_page_info() {
$links[] = l(t("administer news feeds"), "admin/import", array("title" => t("View the news feed administrative pages.")));
}
return "<div align=\"center\">". $theme->links($links) ."</div>";
return "<div align=\"center\">". theme("links", $links) ."</div>";
}
function import_page_last() {
global $theme;
$result = db_query("SELECT i.*, f.title AS ftitle, f.link AS flink FROM item i LEFT JOIN feed f ON i.fid = f.fid ORDER BY i.iid DESC LIMIT ". variable_get("import_page_limit", 75));
......@@ -530,7 +530,7 @@ function import_page_last() {
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
if ($item->link) {
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". $theme->links($links) ."</td></tr>\n";
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
......@@ -541,20 +541,20 @@ function import_page_last() {
}
$output .= "</table>\n";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(t("Latest news"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", t("Latest news"), $output);
theme("footer");
}
function import_page_feed($fid) {
global $theme;
$feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%s'", $fid));
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">$feed->description</div></p>";
$header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
$header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
$result = db_query("SELECT * FROM item WHERE fid = '%s' ORDER BY iid DESC LIMIT ". variable_get("import_page_limit", 75), $fid);
......@@ -566,7 +566,7 @@ function import_page_feed($fid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
$output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". $theme->links($links) ."</td></tr>\n";
$output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
......@@ -576,15 +576,15 @@ function import_page_feed($fid) {
}
$output .= "</table>\n";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box($feed->title, $header);
$theme->box(t("Latest news"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", $feed->title, $header);
theme("box", t("Latest news"), $output);
theme("footer");
}
function import_page_bundle($bid) {
global $theme;
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid));
......@@ -604,7 +604,7 @@ function import_page_bundle($bid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". $theme->links($links) ."</td></tr>\n";
$output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
......@@ -615,16 +615,16 @@ function import_page_bundle($bid) {
}
$output .= "</table>\n";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box($bundle->title, $header);
$theme->box(t("Latest news"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", $bundle->title, $header);
theme("box", t("Latest news"), $output);
theme("footer");
}
function import_page_sources() {
global $theme;
$result = db_query("SELECT * FROM feed ORDER BY title");
......@@ -633,12 +633,12 @@ function import_page_sources() {
$output .= "<div style=\"margin-left: 20px;\">$feed->description</div><br />";
}
$output .= l("<img src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated websites in XML format."))) ."<br />";
$output .= l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated websites in XML format."))) ."<br />";
$theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(t("News sources"), $output);
$theme->footer();
theme("header");
theme("box", t("News feeds"), import_page_info());
theme("box", t("News sources"), $output);
theme("footer");
}
function import_page_fd() {
......@@ -671,10 +671,10 @@ function import_page_feeds() {
}
function import_page_blocks($blocks) {
global $theme;
$theme->header();
$theme->box(t("News feeds"), import_page_info());
theme("header");
theme("box", t("News feeds"), import_page_info());
print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" width=\"100%\">\n";
print " <tr>\n";
......@@ -682,7 +682,7 @@ function import_page_blocks($blocks) {
$i = 1;
print " <td width=\"33%\" valign=\"top\">\n";
while ($block = each($blocks)) {
$theme->box($block["value"]["subject"], $block["value"]["content"]);
theme("box", $block["value"]["subject"], $block["value"]["content"]);
if ($i == ceil(count($blocks) / 3)) {
break;
}
......@@ -693,7 +693,7 @@ function import_page_blocks($blocks) {
print " </tr>\n";
print "</table>\n";
$theme->footer();
theme("footer");
}
function import_page() {
......
modules/archive.module
View file @ 83f5d828
......@@ -137,9 +137,9 @@ function archive_link($type) {
}
function archive_page() {
global $date, $edit, $theme, $op, $month, $year, $meta;
global $date, $edit, $op, $month, $year, $meta;
$theme->header();
theme("header");
if (user_access("access content")) {
if ($op == t("Show")) {
......@@ -166,7 +166,7 @@ function archive_page() {
$start = form_select("", "year", ($year ? $year : date("Y")), $years). form_select("", "month", ($month ? $month : date("m")), $months) . form_select("", "day", ($day ? $day : date("d")), $days) . form_submit(t("Show"));
$start = ereg_replace("<[/]?p>", "", $start);
$theme->box(t("Archives"), form($start));
theme("box", t("Archives"), form($start));
/*
** Fetch nodes for the selected date, or current date if none
......@@ -185,7 +185,7 @@ function archive_page() {
message_access();
}
$theme->footer();
theme("footer");
}
function archive_settings() {
......
modules/archive/archive.module
View file @ 83f5d828
......@@ -137,9 +137,9 @@ function archive_link($type) {
}
function archive_page() {
global $date, $edit, $theme, $op, $month, $year, $meta;
global $date, $edit, $op, $month, $year, $meta;
$theme->header();
theme("header");
if (user_access("access content")) {
if ($op == t("Show")) {
......@@ -166,7 +166,7 @@ function archive_page() {
$start = form_select("", "year", ($year ? $year : date("Y")), $years). form_select("", "month", ($month ? $month : date("m")), $months) . form_select("", "day", ($day ? $day : date("d")), $days) . form_submit(t("Show"));
$start = ereg_replace("<[/]?p>", "", $start);
$theme->box(t("Archives"), form($start));
theme("box", t("Archives"), form($start));
/*
** Fetch nodes for the selected date, or current date if none
......@@ -185,7 +185,7 @@ function archive_page() {
message_access();
}
$theme->footer();
theme("footer");
}
function archive_settings() {
......
modules/block.module
View file @ 83f5d828
......@@ -258,7 +258,7 @@ function block_box_delete($bid) {
}
function block_admin() {
global $edit, $op, $theme;
global $edit, $op;
if (user_access("administer blocks")) {
......
modules/block/block.module
View file @ 83f5d828
......@@ -258,7 +258,7 @@ function block_box_delete($bid) {
}
function block_admin() {
global $edit, $op, $theme;
global $edit, $op;
if (user_access("administer blocks")) {
......
modules/blog.module
View file @ 83f5d828
......@@ -146,7 +146,7 @@ function blog_feed_last() {
}
function blog_page_user($uid = 0) {
global $user, $theme;
global $user;
if ($uid) {
$account = user_load(array((is_numeric($uid) ? "uid" : "name") => $uid, "status" => 1));
......@@ -160,11 +160,11 @@ function blog_page_user($uid = 0) {
node_view(node_load(array("nid" => $node->nid)), 1);
}
print pager_display(NULL, variable_get("default_nodes_main", 10));
print l("<img align=\"right\" src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
print l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
}
function blog_page_last() {
global $user, $theme;
global $user;
$result = pager_query("SELECT nid FROM node WHERE type = 'blog' AND status = 1 ORDER BY nid DESC", variable_get("default_nodes_main", 10));
......@@ -172,7 +172,7 @@ function blog_page_last() {
$output = node_view(node_load(array("nid" => $node->nid)), 1);
}
$output .= pager_display(NULL, variable_get("default_nodes_main", 10));
$output .= l("<img align=\"right\" src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
$output .= l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
return $output;
}
......@@ -220,7 +220,7 @@ function blog_form(&$node, &$help, &$error) {
}
function blog_page() {
global $theme;
if (user_access("access content")) {
switch (arg(1)) {
......@@ -233,20 +233,20 @@ function blog_page() {
}
break;
default:
$theme->header();
theme("header");
if (arg(1)) {
blog_page_user(arg(1));
}
else {
print blog_page_last();
}
$theme->footer();
theme("footer");
}
}
else {
$theme->header();
$theme->box(t("Access denied"), message_access());
$theme->footer();
theme("header");
theme("box", t("Access denied"), message_access());
theme("footer");
}
}
......
modules/blog/blog.module
View file @ 83f5d828
......@@ -146,7 +146,7 @@ function blog_feed_last() {
}
function blog_page_user($uid = 0) {
global $user, $theme;
global $user;
if ($uid) {
$account = user_load(array((is_numeric($uid) ? "uid" : "name") => $uid, "status" => 1));
......@@ -160,11 +160,11 @@ function blog_page_user($uid = 0) {
node_view(node_load(array("nid" => $node->nid)), 1);
}
print pager_display(NULL, variable_get("default_nodes_main", 10));
print l("<img align=\"right\" src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
print l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
}
function blog_page_last() {
global $user, $theme;
global $user;
$result = pager_query("SELECT nid FROM node WHERE type = 'blog' AND status = 1 ORDER BY nid DESC", variable_get("default_nodes_main", 10));
......@@ -172,7 +172,7 @@ function blog_page_last() {
$output = node_view(node_load(array("nid" => $node->nid)), 1);
}
$output .= pager_display(NULL, variable_get("default_nodes_main", 10));
$output .= l("<img align=\"right\" src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
$output .= l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
return $output;
}
......@@ -220,7 +220,7 @@ function blog_form(&$node, &$help, &$error) {
}
function blog_page() {
global $theme;
if (user_access("access content")) {
switch (arg(1)) {
......@@ -233,20 +233,20 @@ function blog_page() {
}
break;
default:
$theme->header();
theme("header");
if (arg(1)) {
blog_page_user(arg(1));
}
else {
print blog_page_last();
}
$theme->footer();
theme("footer");
}
}
else {
$theme->header();
$theme->box(t("Access denied"), message_access());
$theme->footer();
theme("header");
theme("box", t("Access denied"), message_access());
theme("footer");
}
}
......
modules/book.module
View file @ 83f5d828
......@@ -338,7 +338,7 @@ function book_location($node, $nodes = array()) {
}
function book_body($node) {
global $theme, $op;
global $op;
if ($node->format == 1) {
/*
......@@ -367,7 +367,7 @@ function book_body($node) {
}
function book_view($node, $main = 0) {
global $theme, $mod;