From: timeless%mac.com <>
Date: Mon, 15 Apr 2002 10:54:17 +0000 (+0000)
Subject: Bug 92763 Add Windows XP as OS selection for entering/searching bugs
X-Git-Tag: bugzilla-2.16rc1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1c1f169ee55e72c782e8bffc54bbf2b55568ba;p=thirdparty%2Fbugzilla.git
Bug 92763 Add Windows XP as OS selection for entering/searching bugs
patch by ddk r=bbaetz r=justdave
Bug 135666 Creating bugs: OS detection doesn't work for Internet Explorer, Win NT 4.
patch by ddk+johannes.pellenz@sdm.de r=bbaetz r=justdave
Adds Windows XP to the bugzilla OS list
Activates the Windows XP detection (it was commented out waiting for this fix...)
Makes Windows NT (4) detection match the pattern everything else used
---
diff --git a/checksetup.pl b/checksetup.pl
index 6ae737c783..463382fb5b 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -442,6 +442,7 @@ LocalVar('opsys', '
"Windows ME", # Millenium Edition (upgrade of 98)
"Windows 2000",
"Windows NT",
+ "Windows XP",
"Mac System 7",
"Mac System 7.5",
"Mac System 7.6.1",
diff --git a/enter_bug.cgi b/enter_bug.cgi
index 8ca0443b37..ec008b9d63 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -173,11 +173,11 @@ sub pickos {
/\(.*IBM.*\)/ && do {return "OS/2";};
/\(.*QNX.*\)/ && do {return "Neutrino";};
/\(.*VMS.*\)/ && do {return "OpenVMS";};
-# /\(.*Windows XP.*\)/ && do {return "Windows XP";};
-# /\(.*Windows NT 5\.1.*\)/ && do {return "Windows XP";};
+ /\(.*Windows XP.*\)/ && do {return "Windows XP";};
+ /\(.*Windows NT 5\.1.*\)/ && do {return "Windows XP";};
/\(.*Windows 2000.*\)/ && do {return "Windows 2000";};
- /Windows NT 5.*\)/ && do {return "Windows 2000";};
- /\(Windows.*NT/ && do {return "Windows NT";};
+ /\(.*Windows NT 5.*\)/ && do {return "Windows 2000";};
+ /\(.*Windows.*NT.*\)/ && do {return "Windows NT";};
/\(.*Win.*98.*4\.9.*\)/ && do {return "Windows ME";};
/\(.*Win98.*\)/ && do {return "Windows 98";};
/\(.*Win95.*\)/ && do {return "Windows 95";};
diff --git a/queryhelp.cgi b/queryhelp.cgi
index 16345af649..597a5182fd 100755
--- a/queryhelp.cgi
+++ b/queryhelp.cgi
@@ -116,32 +116,99 @@ print qq{