summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/comment.inc5
-rw-r--r--includes/function.inc2
2 files changed, 2 insertions, 5 deletions
diff --git a/includes/comment.inc b/includes/comment.inc
index 9dc3f5570..744ab0f9b 100644
--- a/includes/comment.inc
+++ b/includes/comment.inc
@@ -59,7 +59,7 @@ function comment_reply($pid, $id) {
$pid = 0;
if ($link == "story") {
$item = db_fetch_object(db_query("SELECT stories.*, users.userid FROM stories LEFT JOIN users ON stories.author = users.id WHERE stories.status != 0 AND stories.id = '$id'"));
- $theme->story($item, "");
+ $theme->story($item, "[ ". t("reply to this story") ." ]");
}
}
@@ -93,9 +93,6 @@ function comment_reply($pid, $id) {
function comment_preview($pid, $id, $subject, $comment) {
global $allowed_html, $link, $REQUEST_URI, $theme, $user;
- $subject = check_output($subject);
- $comment = check_output($comment);
-
// Preview comment:
comment_view(new Comment($user->userid, $subject, $comment, time(), $user->url, $user->fake_email, 0, 0, 0, 0), t("reply to this comment"));
diff --git a/includes/function.inc b/includes/function.inc
index 0308a5efc..1b206c500 100644
--- a/includes/function.inc
+++ b/includes/function.inc
@@ -88,7 +88,7 @@ function format_email($address) {
function format_url($address, $description = "") {
global $na;
$description = ($description) ? $description : $address;
- return ($address) ? "<A HREF=\"$address\">$description</A>" : $na;
+ return ($address) ? "<A HREF=\"$address\">". check_output($description) ."</A>" : $na;
}
?>