5 files changed, 8 insertions, 8 deletions
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index a1c4b1f25..0e0c9d4e2 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -52,9 +52,6 @@ our @parampanels = ();
   );
 Exporter::export_ok_tags('admin', 'db', 'localconfig', 'params');
 
-# Bugzilla version
-$Bugzilla::Config::VERSION = "2.23.1+";
-
 use vars qw(@param_list);
 
 # Data::Dumper is required as needed, below. The problem is that then when
diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index 416a87849..9fe648d01 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -299,7 +299,7 @@ sub check_mail_delivery_method {
 sub check_notification {
     my $option = shift;
     my @current_version =
-        ($Bugzilla::Config::VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
+        (BUGZILLA_VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
     if ($current_version[1] % 2 && $option eq 'stable_branch_release') {
         return "You are currently running a development snapshot, and so your " .
                "installation is not based on a branch. If you want to be notified " .
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 0eeb9be66..af1357a99 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -33,6 +33,8 @@ use strict;
 use base qw(Exporter);
 
 @Bugzilla::Constants::EXPORT = qw(
+    BUGZILLA_VERSION
+
     bz_locations
     CONTROLMAPNA
     CONTROLMAPSHOWN
@@ -110,6 +112,10 @@ use base qw(Exporter);
 
 # CONSTANTS
 #
+# Bugzilla version
+use constant BUGZILLA_VERSION => "2.23.1+";
+
+#
 # ControlMap constants for group_control_map.
 # membercontol:othercontrol => meaning
 # Na:Na               => Bugs in this product may not be restricted to this 
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 59cf02dc4..2a6cb901d 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -795,9 +795,6 @@ sub create {
                 Bugzilla::BugMail::Send($id, $mailrecipients);
             },
 
-            # Bugzilla version
-            # This could be made a ref, or even a CONSTANT with TT2.08
-            'VERSION' => $Bugzilla::Config::VERSION ,
         },
 
    }) || die("Template creation failed: " . $class->error());
diff --git a/Bugzilla/Update.pm b/Bugzilla/Update.pm
index 1aef2bf17..31cb2cac0 100644
--- a/Bugzilla/Update.pm
+++ b/Bugzilla/Update.pm
@@ -76,7 +76,7 @@ sub get_notifications {
 
     # On which branch is the current installation running?
     my @current_version =
-        ($Bugzilla::Config::VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
+        (BUGZILLA_VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
 
     my @release;
     if (Bugzilla->params->{'upgrade_notification'} eq 'development_snapshot') {