2 files changed, 8 insertions, 0 deletions
diff --git a/quips.cgi b/quips.cgi
index c36a09b6c..be8d9f3ec 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -38,6 +38,10 @@ require "CGI.pl";
 ConnectToDatabase();
 confirm_login();
 
+if (Param('enablequips') eq "off") {
+    ThrowUserError("quips_disabled");
+}
+    
 my $action = $::FORM{'action'} || "";
 
 if ($action eq "show") {
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 421e396ca..b3b50f68a 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -466,6 +466,10 @@
     [% title = "No Query Name Specified" %]
     You must enter a name for your query.
 
+  [% ELSIF error == "quips_disabled" %]
+    [% title = "Quips Disabled" %]
+    Quips are disabled.
+
   [% ELSIF error == "reassign_to_empty" %]
     [% title = "Illegal Reassignment" %]
     You cannot reassign to a bug to nobody. Unless you