summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/comment.inc6
-rw-r--r--includes/theme.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/comment.inc b/includes/comment.inc
index 6e01ada3d..cf6ce6919 100644
--- a/includes/comment.inc
+++ b/includes/comment.inc
@@ -2,7 +2,7 @@
// Security check:
if (strstr($id, " ") || strstr($pid, " ") || strstr($lid, " ") || strstr($mode, " ") || strstr($order, " ") || strstr($threshold, " ")) {
- watchdog("error", "discussion: attempt to provide malicious input through URI");
+ watchdog("error", "comment: attempt to provide malicious input through URI");
exit();
}
@@ -155,7 +155,7 @@ function comment_post($pid, $id, $subject, $comment) {
$duplicate = db_result(db_query("SELECT COUNT(cid) FROM comments WHERE link = '$link' AND pid = '$pid' AND lid = '$id' AND subject = '". check_input($subject) ."' AND comment = '". check_input($comment) ."'"), 0);
if ($duplicate != 0) {
- watchdog("error", "discussion: attempt to insert duplicate comment");
+ watchdog("error", "comment: attempt to insert duplicate comment");
$theme->box("duplicate comment", "duplicate comment: $duplicate");
}
else {
@@ -163,7 +163,7 @@ function comment_post($pid, $id, $subject, $comment) {
$subject = ($subject) ? $subject : substr($comment, 0, 29);
// Add watchdog entry:
- watchdog("comment", "discussion: added comment with subject '$subject'");
+ watchdog("comment", "comment: added comment with subject '$subject'");
// Add comment to database:
db_query("INSERT INTO comments (link, lid, pid, author, subject, comment, hostname, timestamp, score) VALUES ('". check_input($link) ."', $id, $pid, '$user->id', '". check_input($subject) ."', '". check_input($comment) ."', '". getenv("REMOTE_ADDR") ."', '". time() ."', '". ($user->userid ? 1 : 0) ."')");
diff --git a/includes/theme.inc b/includes/theme.inc
index da6f22797..166470e10 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -62,7 +62,7 @@ function theme_blocks($region, $theme) {
global $id, $PHP_SELF, $user;
switch (strtok($PHP_SELF, ".")) {
- case "/discussion":
+ case "/story":
if ($user->id) $story = db_fetch_object(db_query("SELECT * FROM stories WHERE id = '$id'"));
if ($story->status == 1) theme_moderation_results($theme, $story);
else theme_new_headlines($theme);