diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-10-11 05:59:04 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-10-11 05:59:04 +0200 |
| commit | 085a562c412b8bcdedf978821222f3b6585993e5 (patch) | |
| tree | 10128437780365c529c03fd860db6d663ecbaa5e | |
| parent | 26bbdeba1c9dcfe557a47f31ed5a408bf39d3153 (diff) | |
| parent | 4187d8af5055102d2478f3d6021ae2daf19b49b5 (diff) | |
| download | bugzilla-085a562c412b8bcdedf978821222f3b6585993e5.tar.gz bugzilla-085a562c412b8bcdedf978821222f3b6585993e5.tar.xz | |
merged with bugzilla/4.2
| -rw-r--r-- | Bugzilla/DB/Schema/Oracle.pm | 4 | ||||
| -rwxr-xr-x | buglist.cgi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm index 87f4e0115..37b406671 100644 --- a/Bugzilla/DB/Schema/Oracle.pm +++ b/Bugzilla/DB/Schema/Oracle.pm @@ -219,6 +219,10 @@ sub get_add_column_ddl { } else { @sql = $self->SUPER::get_add_column_ddl(@_); + # Create triggers to deal with empty string. + if ($definition->{TYPE} =~ /varchar|TEXT/i && $definition->{NOTNULL}) { + push(@sql, _get_notnull_trigger_ddl($table, $column)); + } } return @sql; diff --git a/buglist.cgi b/buglist.cgi index 8646f4028..9c7281822 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -140,7 +140,7 @@ my $serverpush = && exists $ENV{'HTTP_USER_AGENT'} && $ENV{'HTTP_USER_AGENT'} =~ /Mozilla.[3-9]/ && (($ENV{'HTTP_USER_AGENT'} !~ /[Cc]ompatible/) || ($ENV{'HTTP_USER_AGENT'} =~ /MSIE 5.*Mac_PowerPC/)) - && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident)/ + && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident|KHTML)/ && !$agent && !defined($cgi->param('serverpush')) || $cgi->param('serverpush'); |