summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/hostname.conf3
-rw-r--r--includes/user.inc2
-rw-r--r--includes/watchdog.inc3
3 files changed, 3 insertions, 5 deletions
diff --git a/includes/hostname.conf b/includes/hostname.conf
index dff4d0732..3d55ddcd3 100644
--- a/includes/hostname.conf
+++ b/includes/hostname.conf
@@ -70,8 +70,7 @@ $moderation_votes = array("neutral (+0)" => "+ 0",
# Example: '"comment" => 60' means that there is only one new comment allowed from the same IP-address every 60 seconds.
#
$submission_rate = array("comment" => "60", // 60 seconds = 1 minute
- "diary" => "300", // 300 seconds = 5 minutes
- "story" => "300"); // 300 seconds = 5 minutes
+ "node" => "300") // 300 seconds = 5 minutes
#
# Submission size:
diff --git a/includes/user.inc b/includes/user.inc
index ad73efa8b..ce5820023 100644
--- a/includes/user.inc
+++ b/includes/user.inc
@@ -41,7 +41,7 @@ function user_save($account, $array) {
else db_query("INSERT INTO users SET $query last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_ADDR]'");
// return account:
- return user_load(($account->userid ? $account->userid : $array["userid"]));
+ return user_load(($account->userid ? $account->userid : $array[userid]));
}
function user_get($account, $column, $field) {
diff --git a/includes/watchdog.inc b/includes/watchdog.inc
index 4512be755..2d221c842 100644
--- a/includes/watchdog.inc
+++ b/includes/watchdog.inc
@@ -1,8 +1,7 @@
<?php
$watchdog = array("comment" => array("0", $submission_rate["comment"]),
- "diary" => array("1", $submission_rate["diary"]),
- "story" => array("2", $submission_rate["story"]),
+ "node" => array("1", $submission_rate["node"]),
"message" => array("3", "0"),
"warning" => array("4", "0"),
"error" => array("5", "0"));