From 9c43e8fc7a192dfe768c76a539373915bddaa0aa Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 29 Jun 2001 22:08:57 +0000 Subject: Extremely large commit: - Fixed tiny quote problem in account.php. - Fixed tiny bug in comment.inc. - Fixed tiny bug in comment.module. - Fixed tiny bug in meta.module. - Simplified user_access() API. - Rewrote link system: still needs fine-tuning and testing so don't upgrade if you are running a production site. ;) Updated all modules and themes to reflect this change. All other themes and modules need updating too! --- themes/example/example.theme | 8 ++++---- themes/goofy/goofy.theme | 6 +++--- themes/jeroen/jeroen.theme | 8 ++++---- themes/marvin/marvin.theme | 12 +++++------- themes/unconed/unconed.theme | 10 +++++----- themes/yaroon/yaroon.theme | 6 +++--- 6 files changed, 24 insertions(+), 26 deletions(-) (limited to 'themes') diff --git a/themes/example/example.theme b/themes/example/example.theme index e53496b68..3f4889685 100644 --- a/themes/example/example.theme +++ b/themes/example/example.theme @@ -30,7 +30,7 @@ links(link_page()); ?> @@ -50,7 +50,7 @@ } // close header function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { ?> @@ -83,7 +83,7 @@ @@ -178,7 +178,7 @@ diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme index 9cb913975..9444db289 100644 --- a/themes/goofy/goofy.theme +++ b/themes/goofy/goofy.theme @@ -86,7 +86,7 @@ function c(subject,mod,author,date,body) {document.writeln("
links($links, $main); + if ($main) echo $this->links(link_node($node)); ?>
-

+

links(link_page()); ?>
- + @@ -99,12 +99,12 @@ function c(subject,mod,author,date,body) {document.writeln("
links(link_page()); ?>
title\" -->\n"; $title = check_output($node->title); $subleft = strtr(t("Submitted by %a on %b"), array("%a" => format_username($node->userid), "%b" => format_date($node->timestamp, "large"))); $subright = node_index($node); - $body = check_output($node->body, 1) . (node_links($links, $node, $main) ? "
[ " . $this->links($links, $main) . " ]
" : ""); + $body = check_output($node->body, 1) . ($main ? "
[ " . $this->links(link_node($node)) . " ]
" : ""); print "\n"; } // close node function diff --git a/themes/jeroen/jeroen.theme b/themes/jeroen/jeroen.theme index c5685f326..739c7b16e 100644 --- a/themes/jeroen/jeroen.theme +++ b/themes/jeroen/jeroen.theme @@ -84,7 +84,7 @@ } // close header function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { ?> @@ -138,8 +138,8 @@ @@ -310,7 +310,7 @@ diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index c24cb68f3..583011daf 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -1,4 +1,4 @@ - @@ -50,7 +50,7 @@ title\" -->\n"; print "
links($links, $main); + if ($main) + echo $this->links(node_link($node)); ?>
  - [ ] + [ links(link_page()); ?> ]  
". theme_link() ."\n"; + print "". $this->links(link_page()) ."\n"; ?>
\n"; print " \n"; @@ -59,9 +59,7 @@ print " \n"; print " \n"; print " \n"; - if (node_links($links, $node, $main)) { - print " \n"; - } + if ($main) print " \n"; print "
\"\"   ". check_output($node->title) ."
 

". check_output($node->body, 1) ."

 
". $this->links($links, $main) ."
". $this->links(link_node($node)) ."
\n"; print "

\n\n"; } @@ -145,7 +143,7 @@ [ ". theme_link() ." ]

". variable_get("site_footer", "") ."

\n"; + print "

[ ". $this->links(link_page()) ." ]

". variable_get("site_footer", "") ."

\n"; ?> diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index a51f6222f..0eeb72e7b 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -63,7 +63,7 @@ -
+
links(link_page()); ?>
title\" -->\n"; ?> @@ -101,8 +101,8 @@ bgcolor3 ."\">bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">[ ". $this->links($links, $main) ." ]"; + if ($main) + echo "bgcolor3 ."\">bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">[ ". $this->links(link_node($node)) ." ]"; ?>
-
+
links(link_page()); ?>
diff --git a/themes/yaroon/yaroon.theme b/themes/yaroon/yaroon.theme index 66280be8b..f0dd622a5 100644 --- a/themes/yaroon/yaroon.theme +++ b/themes/yaroon/yaroon.theme @@ -112,7 +112,7 @@ } // close header function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { switch ($node->tid) { case 0: $color = "#c4a2a2"; $img = "square2.gif"; break; @@ -145,8 +145,8 @@ "; - if (node_links($links, $node, $main)) - echo $this->links($links, $main); + if ($main) + echo $this->links(node_link($node)); echo""; ?> -- cgit v1.2.3