Bug 328186: checksetup.pl should display the version of Bugzilla - Patch by Rémi Zara <remi_zara@mac.com> r=mkanat a=justdave

6 files changed, 6 insertions, 6 deletions

diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 1e35d8f36..a941ebc62 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -24,7 +24,7 @@
 <?xml version="1.0" [% IF Param('utf8') %]encoding="UTF-8" [% END %]standalone="yes" ?>
 <!DOCTYPE bugzilla SYSTEM "[% Param('urlbase') %]bugzilla.dtd">
 
-<bugzilla version="[% VERSION %]"
+<bugzilla version="[% constants.BUGZILLA_VERSION %]"
           urlbase="[% Param('urlbase') %]"
           maintainer="[% Param('maintainer') FILTER xml %]"
 [% IF user.id %]
diff --git a/template/en/default/config.js.tmpl b/template/en/default/config.js.tmpl
index 00ba58983..2427c8748 100644
--- a/template/en/default/config.js.tmpl
+++ b/template/en/default/config.js.tmpl
@@ -27,7 +27,7 @@
 // the global bugzilla url
 var installation = {
   base_url        : '[% Param('urlbase') FILTER js %]',
-  install_version : '[% VERSION FILTER js %]',
+  install_version : '[% constants.BUGZILLA_VERSION FILTER js %]',
   maintainer      : '[% Param('maintainer') FILTER js %]'
 };
 
diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index 4c1047f50..32e94cbca 100644
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -28,7 +28,7 @@
      xmlns:bz="http://www.bugzilla.org/rdf#">
 
 <bz:installation rdf:about="[% Param('urlbase') FILTER html %]">
-  <bz:install_version>[% VERSION FILTER html %]</bz:install_version>
+  <bz:install_version>[% constants.BUGZILLA_VERSION FILTER html %]</bz:install_version>
   <bz:maintainer>[% Param('maintainer') FILTER html %]</bz:maintainer>
 
   <bz:status>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index eee3b8963..14043a9bf 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -350,7 +350,7 @@
 ],
 
 'bug/show.xml.tmpl' => [
-  'VERSION', 
+  'constants.BUGZILLA_VERSION', 
   'a.id', 
   'field', 
 ],
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 053c03b92..9e11e4af0 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -32,7 +32,7 @@
 [% PROCESS global/header.html.tmpl
    title = "$terms.Bugzilla Main Page"
    h1 = "Main Page" 
-   h3 = "version $VERSION"
+   h3 = "version $constants.BUGZILLA_VERSION"
    style_urls = [ 'skins/standard/index.css' ]
    onload = 'document.forms[\'f\'].quicksearch.focus();'
 %]
diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl
index 6246cf755..f857d30b6 100644
--- a/template/en/default/list/list.ics.tmpl
+++ b/template/en/default/list/list.ics.tmpl
@@ -54,7 +54,7 @@ END:VTODO
 END:VCALENDAR
 
 [% BLOCK ics_prodid %]
-  [% "-//Mozilla/Bugzilla $VERSION//EN" FILTER ics('PRODID') %]
+  [% "-//Mozilla/Bugzilla $constants.BUGZILLA_VERSION//EN" FILTER ics('PRODID') %]
 [% END %]
 
 [% BLOCK ics_uid %]