Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.666
diff -u -p -r1.666 comment.module
--- modules/comment/comment.module	23 Nov 2008 16:04:41 -0000	1.666
+++ modules/comment/comment.module	2 Dec 2008 12:40:50 -0000
@@ -668,6 +668,18 @@ function comment_user_delete(&$edit, &$u
 }
 
 /**
+ * Implementation of hook_comment().
+ */
+function comment_comment($comment, $op) {
+  switch ($op) {
+    case 'insert':
+    case 'update':
+      $_SESSION['ignore_slave_server'] = REQUEST_TIME + variable_get('maximal_replication_lag', 10);
+      break;
+  }
+}
+
+/**
  * This is *not* a hook_access() implementation. This function is called
  * to determine whether the current user has access to a particular comment.
  *
cvs diff: Diffing modules/contact
cvs diff: Diffing modules/dblog
cvs diff: Diffing modules/filter
cvs diff: Diffing modules/forum
cvs diff: Diffing modules/help
cvs diff: Diffing modules/locale
cvs diff: Diffing modules/menu
cvs diff: Diffing modules/node
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.998
diff -u -p -r1.998 node.module
--- modules/node/node.module	22 Nov 2008 14:09:41 -0000	1.998
+++ modules/node/node.module	2 Dec 2008 12:40:51 -0000
@@ -1421,6 +1421,21 @@ function node_user_delete(&$edit, &$user
 }
 
 /**
+ * Implementation of hook_nodeapi_insert().
+ */
+function node_nodeapi_insert(&$node) {
+  $_SESSION['ignore_slave_server'] = REQUEST_TIME + variable_get('maximal_replication_lag', 10);
+}
+
+/**
+ * Implementation of hook_nodeapi_update().
+ */
+function node_nodeapi_update(&$node) {
+  $_SESSION['ignore_slave_server'] = REQUEST_TIME + variable_get('maximal_replication_lag', 10);
+}
+
+
+/**
  * Theme the content ranking part of the search settings admin page.
  *
  * @ingroup themeable
cvs diff: Diffing modules/openid
cvs diff: Diffing modules/path
cvs diff: Diffing modules/php
cvs diff: Diffing modules/poll
cvs diff: Diffing modules/profile
cvs diff: Diffing modules/search
cvs diff: Diffing modules/simpletest
cvs diff: Diffing modules/simpletest/files
cvs diff: Diffing modules/simpletest/tests
cvs diff: Diffing modules/statistics
cvs diff: Diffing modules/syslog
cvs diff: Diffing modules/system
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.650
diff -u -p -r1.650 system.module
--- modules/system/system.module	28 Nov 2008 09:25:59 -0000	1.650
+++ modules/system/system.module	2 Dec 2008 12:40:52 -0000
@@ -750,6 +750,17 @@ function system_init() {
   drupal_add_css(drupal_get_path('module', 'system') . '/defaults.css');
   drupal_add_css(drupal_get_path('module', 'system') . '/system.css');
   drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css');
+
+  // Check whether this user should not use a potential slave server
+  // for the current request.
+  if (isset($_SESSION['ignore_slave_server'])) {
+    if ($_SESSION['ignore_slave_server'] < REQUEST_TIME) {
+      Database::ignoreTarget('default', 'slave');
+    }
+    else {
+      unset($_SESSION['ignore_slave_server']);
+    }
+  }
 }
 
 /**
cvs diff: Diffing modules/taxonomy
cvs diff: Diffing modules/tracker
cvs diff: Diffing modules/translation
cvs diff: Diffing modules/trigger
cvs diff: Diffing modules/update
cvs diff: Diffing modules/upload
cvs diff: Diffing modules/user
cvs diff: Diffing profiles
cvs diff: Diffing profiles/default
cvs diff: Diffing profiles/expert
cvs diff: Diffing scripts
cvs diff: Diffing sites
cvs diff: Diffing sites/all
cvs diff: Diffing sites/default
cvs diff: Diffing themes
cvs diff: Diffing themes/bluemarine
cvs diff: Diffing themes/chameleon
cvs diff: Diffing themes/chameleon/marvin
cvs diff: Diffing themes/engines
cvs diff: Diffing themes/engines/phptemplate
cvs diff: Diffing themes/garland
cvs diff: Diffing themes/garland/color
cvs diff: Diffing themes/garland/images
cvs diff: Diffing themes/garland/minnelli
cvs diff: Diffing themes/garland/minnelli/color
cvs diff: Diffing themes/pushbutton