Bug 40933 - debug
git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@744 6955db30-a419-402b-8a0d-67ecbb4d7f56master
parent
324de4b5b4
commit
4c39fce8a6
|
@ -104,8 +104,12 @@ sub install_string {
|
|||
last if defined $string_template;
|
||||
}
|
||||
|
||||
die "No language defines the string '$string_id'"
|
||||
if !defined $string_template;
|
||||
if (!defined $string_template)
|
||||
{
|
||||
# Don't throw an error, it's a stupid way -- <vitalif@yourcmc.ru>
|
||||
$string_template = $string_id;
|
||||
$string_template =~ s/^feature_//so;
|
||||
}
|
||||
|
||||
utf8::decode($string_template) if !utf8::is_utf8($string_template);
|
||||
|
||||
|
|
|
@ -1510,8 +1510,6 @@ sub _content_matches
|
|||
my $table = "bugs_fulltext_$$chartid";
|
||||
my $comments_col = "comments";
|
||||
$comments_col = "comments_noprivate" unless $self->{'user'}->is_insider;
|
||||
push(@$supptables, "LEFT JOIN bugs_fulltext AS $table " .
|
||||
"ON bugs.bug_id = $table.bug_id");
|
||||
|
||||
# Create search terms to add to the SELECT and WHERE clauses.
|
||||
my ($term1, $rterm1) = $dbh->sql_fulltext_search("$table.$comments_col",
|
||||
|
|
|
@ -868,7 +868,9 @@ sub create {
|
|||
my @optional = @{OPTIONAL_MODULES()};
|
||||
foreach my $item (@optional) {
|
||||
my @features;
|
||||
foreach my $feat_id (@{ $item->{feature} }) {
|
||||
my $feat = $item->{feature};
|
||||
ref $feat or $feat = [ $feat ];
|
||||
foreach my $feat_id (@$feat) {
|
||||
push(@features, install_string("feature_$feat_id"));
|
||||
}
|
||||
$item->{feature} = \@features;
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
use strict;
|
||||
use Testopia::TestCase;
|
||||
use Bugzilla::Util;
|
||||
|
||||
my $vars = Bugzilla->hook_args->{vars};
|
||||
my $cgi = Bugzilla->cgi;
|
||||
|
|
Loading…
Reference in New Issue