Fix for bug 121747: Stops every script before it does anything else if Bugzilla is currently shut down. Also adds global template

instantiation code to globals.pl.
Patch by Myk Melez <myk@mozilla.org>.
r=gerv,kiko

2 files changed, 21 insertions, 8 deletions

diff --git a/template/default/global/header b/template/default/global/header
index 1efdbf51c..627a52571 100755
--- a/template/default/global/header
+++ b/template/default/global/header
@@ -41,11 +41,8 @@
     </table>
 [% END %]
 
-    [% IF message %]
-      <table width="100%" cellspacing="0" cellpadding="5" border="1"><tr><td>
-        <font color="green">[% message %]</font>
-      </td></tr></table>
-    [% END %]
-
-    [% Param('shutdownhtml') %]
-
+[% IF message %]
+  <table width="100%" cellspacing="0" cellpadding="5" border="1"><tr><td>
+    <font color="green">[% message %]</font>
+  </td></tr></table>
+[% END %]
diff --git a/template/default/global/message.html.tmpl b/template/default/global/message.html.tmpl
new file mode 100644
index 000000000..03253242a
--- /dev/null
+++ b/template/default/global/message.html.tmpl
@@ -0,0 +1,16 @@
+[% DEFAULT title = "Bugzilla Message" %]
+
+[% INCLUDE global/header title=title %]
+
+[%# The "header" template automatically displays the contents of a "message"
+    variable if it finds one, so it is not necessary to display the message
+    here. %]
+
+[%# Display a URL if the calling script has included one. %]
+[% IF url && link %]
+  <p>
+    <a href="[% url %]">[% link %]</a>
+  </p>
+[% END %]
+
+[% INCLUDE global/footer %]