summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-04-30 23:58:22 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-04-30 23:58:22 +0200
commit617e59c29d0987ab03dc59db4f97df36dc29b58f (patch)
tree4a6542c913983060be9b225d0ed1510c87aba874
parent9d03ba42c45d0bff8ca490df80e431de23b2e308 (diff)
parent23a53530d7432b6689efdcb4cc79ecc304b082e0 (diff)
downloadbugzilla-617e59c29d0987ab03dc59db4f97df36dc29b58f.tar.gz
bugzilla-617e59c29d0987ab03dc59db4f97df36dc29b58f.tar.xz
merged with bugzilla/4.2
-rw-r--r--Bugzilla/DB/Oracle.pm2
-rw-r--r--Bugzilla/Install/DB.pm7
2 files changed, 2 insertions, 7 deletions
diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index 644276898..20eb0e550 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -74,7 +74,7 @@ sub new {
my $dsn = "dbi:Oracle:host=$host;sid=$dbname";
$dsn .= ";port=$port" if $port;
my $attrs = { FetchHashKeyName => 'NAME_lc',
- LongReadLen => max(Bugzilla->params->{'maxattachmentsize'},
+ LongReadLen => max(Bugzilla->params->{'maxattachmentsize'} || 0,
MIN_LONG_READ_LEN) * 1024,
};
my $self = $class->db_new({ dsn => $dsn, user => $user,
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 104caac3b..e492c8db7 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -3573,9 +3573,6 @@ sub _migrate_user_tags {
VALUES (?, ?)');
my $sth_nq = $dbh->prepare('UPDATE namedqueries SET query = ?
WHERE id = ?');
- my $sth_nq_footer = $dbh->prepare(
- 'DELETE FROM namedqueries_link_in_footer
- WHERE user_id = ? AND namedquery_id = ?');
if (scalar @$tags) {
print install_string('update_queries_to_tags'), "\n";
@@ -3615,13 +3612,11 @@ sub _migrate_user_tags {
next if !$bug_id;
$sth_bug_tag->execute($bug_id, $tag_id);
}
-
+
# Existing tags may be used in whines, or shared with
# other users. So we convert them rather than delete them.
$uri->query_param('tag', $tag_name);
$sth_nq->execute($uri->query, $query_id);
- # But we don't keep showing them in the footer.
- $sth_nq_footer->execute($user_id, $query_id);
}
$dbh->bz_commit_transaction();