diff options
-rw-r--r-- | docs/en/rel_notes.txt | 12 | ||||
-rwxr-xr-x | query.cgi | 38 |
2 files changed, 6 insertions, 44 deletions
diff --git a/docs/en/rel_notes.txt b/docs/en/rel_notes.txt index 614fcb5a1..4014951f0 100644 --- a/docs/en/rel_notes.txt +++ b/docs/en/rel_notes.txt @@ -3019,10 +3019,10 @@ known to us after the Bugzilla 2.14 release. *** USERS UPGRADING FROM 2.8 OR EARLIER *** ******************************************* -Release notes were not compiled for versions of Bugzilla before -2.12. - -The file 'UPGRADING-pre-2.8' contains instructions you may -need to perform in addition to running 'checksetup.pl' if you -are running a pre 2.8 version. +This version of Bugzilla cannot upgrade from version 2.8 (released +November 19, 1999). You will first have to upgrade to Bugzilla 3.6 and +then upgrade to the latest release. +If you are upgrading from a version earlier than 2.8, See the +PGRADING-pre-2.8 file in Bugzilla 3.0 for information +on upgrading from a version that is earlier than 2.8. @@ -49,44 +49,6 @@ my $buffer = $cgi->query_string(); my $user = Bugzilla->login(); my $userid = $user->id; -# Backwards compatibility hack -- if there are any of the old QUERY_* -# cookies around, and we are logged in, then move them into the database -# and nuke the cookie. This is required for Bugzilla 2.8 and earlier. -if ($userid) { - my @oldquerycookies; - foreach my $i ($cgi->cookie()) { - if ($i =~ /^QUERY_(.*)$/) { - push(@oldquerycookies, [$1, $i, $cgi->cookie($i)]); - } - } - if (defined $cgi->cookie('DEFAULTQUERY')) { - push(@oldquerycookies, [DEFAULT_QUERY_NAME, 'DEFAULTQUERY', - $cgi->cookie('DEFAULTQUERY')]); - } - if (@oldquerycookies) { - foreach my $ref (@oldquerycookies) { - my ($name, $cookiename, $value) = (@$ref); - if ($value) { - # If the query name contains invalid characters, don't import. - $name =~ /[<>&]/ && next; - trick_taint($name); - $dbh->bz_start_transaction(); - my $query = $dbh->selectrow_array( - "SELECT query FROM namedqueries " . - "WHERE userid = ? AND name = ?", - undef, ($userid, $name)); - if (!$query) { - $dbh->do("INSERT INTO namedqueries " . - "(userid, name, query) VALUES " . - "(?, ?, ?)", undef, ($userid, $name, $value)); - } - $dbh->bz_commit_transaction(); - } - $cgi->remove_cookie($cookiename); - } - } -} - if ($cgi->param('nukedefaultquery')) { if ($userid) { $dbh->do("DELETE FROM namedqueries" . |