Bug 192393 - $::dbwritesallowed never set

r, a=justdave

1 files changed, 17 insertions, 1 deletions

diff --git a/Bugzilla.pm b/Bugzilla.pm
index a45c5ca0f..56d1f24cc 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -46,7 +46,6 @@ sub cgi {
 my $_dbh;
 my $_dbh_main;
 my $_dbh_shadow;
-
 sub dbh {
     my $class = shift;
 
@@ -58,6 +57,17 @@ sub dbh {
     return $_dbh;
 }
 
+sub dbwritesallowed {
+    my $class = shift;
+
+    # We can write if we are connected to the main database.
+    # Note that if we don't have a shadowdb, then we claim that its ok
+    # to write even if we're nominally connected to the shadowdb.
+    # This is OK because this method is only used to test if misc
+    # updates can be done, rather than anything complicated.
+    return $class->dbh == $_dbh_main;
+}
+
 sub switch_to_shadow_db {
     my $class = shift;
 
@@ -175,6 +185,12 @@ method for those scripts/templates which are only use via CGI, though.
 
 The current database handle. See L<DBI>.
 
+=item C<dbwritesallowed>
+
+Determines if writes to the database are permitted. This is usually used to
+determine if some general cleanup needs to occur (such as clearing the token
+table)
+
 =item C<switch_to_shadow_db>
 
 Switch from using the main database to using the shadow database.