diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/function.inc | 4 | ||||
| -rw-r--r-- | includes/watchdog.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/function.inc b/includes/function.inc index a92d349d5..adcb4c518 100644 --- a/includes/function.inc +++ b/includes/function.inc @@ -68,10 +68,10 @@ function format_interval($timestamp) { $output .= floor($timestamp / 60) ." min "; $timestamp = $timestamp % 60; } - if ($timestamp >= 0) { + if ($timestamp > 0) { $output .= "$timestamp sec"; } - return $output; + return ($output) ? $output : "0 sec"; } function format_date($timestamp, $type = "medium") { diff --git a/includes/watchdog.inc b/includes/watchdog.inc index 2a007e3ce..4de8210db 100644 --- a/includes/watchdog.inc +++ b/includes/watchdog.inc @@ -10,7 +10,7 @@ $watchdog = array("comment" => array("0", $submission_rate["comment"]), function watchdog($id, $message) { global $user, $watchdog, $watchdog_history; - if ($watchdog[$id][1]) { + if ($watchdog[$id][1] && !($user->permissions == 1 || $user->id == 1)) { if ($log = db_fetch_object(db_query("SELECT * FROM watchdog WHERE hostname = '". getenv("REMOTE_ADDR") ."' AND level = '". $watchdog[$id][0] ."'"))) { if (time() - $log->timestamp < $watchdog[$id][1]) { watchdog("warning", "'". getenv("REMOTE_ADDR") ."' exceeded '$id' submission rate"); |