diff options
| author | David Lawrence <dkl@mozilla.com> | 2014-04-01 21:26:31 +0200 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-04-01 21:26:31 +0200 |
| commit | df1d177c7c6edb850020bf54def8c5f401417b72 (patch) | |
| tree | 56837d5c11ef0021ead1fc941072aa8c13816f82 /extensions | |
| parent | e348ebc732d8c9d24d83def222a9ef52244a5bca (diff) | |
| parent | b42469e3632fe96b0475fa00f07d6ca5abc0e2dc (diff) | |
| download | bugzilla-df1d177c7c6edb850020bf54def8c5f401417b72.tar.gz bugzilla-df1d177c7c6edb850020bf54def8c5f401417b72.tar.xz | |
Merge branch '4.2' of ssh://git.mozilla.org/webtools/bmo/bugzilla into 4.2
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl | 1 | ||||
| -rw-r--r-- | extensions/Review/Extension.pm | 2 | ||||
| -rw-r--r-- | extensions/TryAutoLand/Extension.pm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl index f6d68a5af..786010a34 100644 --- a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl +++ b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl @@ -54,6 +54,7 @@ function persona_onlogin(assertion) { [% FOREACH field = cgi.param() %] [% NEXT IF field.search("^(Bugzilla_(login|password|restrictlogin)|token|persona_assertion)$") %] + [% NEXT UNLESS cgi.param(field).can('slice') %] [% FOREACH mvalue = cgi.param(field).slice(0) %] createHidden('[% field FILTER js %]', '[% mvalue FILTER html_linebreak FILTER js %]', form); [% END %] diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm index 8d069e8e6..634e7c9cd 100644 --- a/extensions/Review/Extension.pm +++ b/extensions/Review/Extension.pm @@ -646,7 +646,7 @@ sub db_schema_abstract_schema { }, attachment_id => { - TYPE => 'INT3', + TYPE => 'INT5', REFERENCES => { TABLE => 'attachments', COLUMN => 'attach_id', diff --git a/extensions/TryAutoLand/Extension.pm b/extensions/TryAutoLand/Extension.pm index 40dbb70d9..8aaadff95 100644 --- a/extensions/TryAutoLand/Extension.pm +++ b/extensions/TryAutoLand/Extension.pm @@ -61,7 +61,7 @@ sub db_schema_abstract_schema { $args->{'schema'}->{'autoland_attachments'} = { FIELDS => [ attach_id => { - TYPE => 'INT3', + TYPE => 'INT5', NOTNULL => 1, PRIMARYKEY => 1, REFERENCES => { |