diff options
| -rw-r--r-- | Bugzilla/Util.pm | 26 | ||||
| -rwxr-xr-x | showdependencygraph.cgi | 6 |
2 files changed, 4 insertions, 28 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index e97bb11d0..c6560dd11 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -39,7 +39,6 @@ use base qw(Exporter); lsearch diff_arrays diff_strings trim wrap_comment find_wrap_point - perform_substs format_time format_time_decimal validate_date file_mod_time is_7bit_clean bz_crypt generate_random_password @@ -355,12 +354,6 @@ sub find_wrap_point { return $wrappoint; } -sub perform_substs { - my ($str, $substs) = (@_); - $str =~ s/%([a-z]*)%/(defined $substs->{$1} ? $substs->{$1} : Bugzilla->params->{$1})/eg; - return $str; -} - sub format_time { my ($date, $format) = @_; @@ -566,7 +559,6 @@ Bugzilla::Util - Generic utility functions for bugzilla $val = trim(" abc "); ($removed, $added) = diff_strings($old, $new); $wrapped = wrap_comment($comment); - $msg = perform_substs($str, $substs); # Functions for formatting time format_time($time); @@ -768,24 +760,6 @@ Search for a comma, a whitespace or a hyphen to split $string, within the first $maxpos characters. If none of them is found, just split $string at $maxpos. The search starts at $maxpos and goes back to the beginning of the string. -=item C<perform_substs($str, $substs)> - -Performs substitutions for sending out email with variables in it, -or for inserting a parameter into some other string. - -Takes a string and a reference to a hash containing substitution -variables and their values. - -If the hash is not specified, or if we need to substitute something -that's not in the hash, then we will use parameters to do the -substitution instead. - -Substitutions are always enclosed with '%' symbols. So they look like: -%some_variable_name%. If "some_variable_name" is a key in the hash, then -its value will be placed into the string. If it's not a key in the hash, -then the value of the parameter called "some_variable_name" will be placed -into the string. - =item C<is_7bit_clean($str)> Returns true is the string contains only 7-bit characters (ASCII 32 through 126, diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index 9851a218c..4842f484d 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -244,8 +244,10 @@ chmod 0777, $filename; my $webdotbase = Bugzilla->params->{'webdotbase'}; if ($webdotbase =~ /^https?:/) { - # Remote dot server - my $url = perform_substs($webdotbase) . $filename; + # Remote dot server. We don't hardcode 'urlbase' here in case + # 'sslbase' is in use. + $webdotbase =~ s/%([a-z]*)%/Bugzilla->params->{$1}/g; + my $url = $webdotbase . $filename; $vars->{'image_url'} = $url . ".gif"; $vars->{'map_url'} = $url . ".map"; } else { |