summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/function.inc2
-rw-r--r--includes/template.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/function.inc b/includes/function.inc
index de2dbaac0..281eb0358 100644
--- a/includes/function.inc
+++ b/includes/function.inc
@@ -71,7 +71,7 @@ function format_date($timestamp, $type = "medium") {
return $date;
}
-function format_data($field, $replacement = "<I>n/a</I>") {
+function format_data($field, $replacement = "<I>na</I>") {
return ($field) ? $field : $replacement;
}
diff --git a/includes/template.inc b/includes/template.inc
index 08d469d94..8e86620a0 100644
--- a/includes/template.inc
+++ b/includes/template.inc
@@ -61,13 +61,13 @@ function display_old_headlines($theme, $num = 10) {
function display_comment_moderation($id, $author, $score, $votes) {
global $user, $comment_votes;
- if ($user && $user->userid != $author && !user_getHistory($user->history, "c$id")) {
+ if ($user->userid && $user->userid != $author && !user_getHistory($user->history, "c$id")) {
$output .= "<SELECT NAME=\"moderate[$id]\">\n";
foreach ($comment_votes as $key=>$value) $output .= " <OPTION VALUE=\"$value\">$key</OPTION>\n";
$output .= "</SELECT>\n";
}
else {
- $output .= "<TABLE BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"0\"><TR><TD>score:</TD><TD>$score</TD></TR><TR><TD>votes:</TD><TD>$votes</TR></TABLE>";
+ $output .= "<TABLE BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"0\"><TR><TD>score:</TD><TD>". format_data($score) ."</TD></TR><TR><TD>votes:</TD><TD>". format_data($votes) ."</TR></TABLE>";
}
print $output;