A lot of small changes (search-n-replace) make a big commit:

  - fixed update bug in book.module
  - provide a log message when both adding and updating book pages
  - all configurable variables are now accessed through "variable_get()":
  - rewrote watchdog and submission throttle and removed watchdog.inc
  - improved robustness of sections.inc
  - imporved story.module
  - updated ./database/database.sql

1 files changed, 5 insertions, 7 deletions

diff --git a/error.php b/error.php
index f4ffc1f52..6f2f1cfd2 100644
--- a/error.php
+++ b/error.php
@@ -1,9 +1,7 @@
 <?php
 
-function error_flood() {
-  global $site_email;
-
-  print "WARNING: submission rate exceeded.  We detected too much data or events from your IP.  Please wait a few minutes and try again.  If you think this is not justified, please contact us at <A HREF=\"mailto:$site_email\">$site_email</A>.";
+function error_throttle() {
+  print "WARNING: submission rate exceeded.  We detected too much data or events from your IP.  Please wait a few minutes and try again.  If you believe this is not justified, please contact us at <A HREF=\"mailto:". variable_get(site_mail, "root@localhost") ."\">". variable_get(site_mail, "root@localhost") ."</A>.";
 }
 
 function error_httpd() {
@@ -42,11 +40,11 @@ function error_httpd() {
 include_once "includes/common.inc";
 
 switch ($op) {
-  case "flood":
-    error_flood();
+  case "throttle":
+    error_throttle();
     break;
   default:
     error_httpd();
 }
 
-?>
+?>
\ No newline at end of file