|
20 | 20 | use File::Find qw();
|
21 | 21 | use File::Basename qw(basename);
|
22 | 22 | use Time::HiRes qw(gettimeofday tv_interval);
|
| 23 | +use Digest::MD5 qw(md5_hex); |
| 24 | + |
23 | 25 | binmode STDOUT, ':utf8';
|
24 | 26 |
|
25 | 27 | if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
|
@@ -490,7 +492,6 @@ sub evaluate_uri {
|
490 | 492 | # Currently available providers are gravatar and picon.
|
491 | 493 | # If an unknown provider is specified, the feature is disabled.
|
492 | 494 |
|
493 |
| - # Gravatar depends on Digest::MD5. |
494 | 495 | # Picon currently relies on the indiana.edu database.
|
495 | 496 |
|
496 | 497 | # To enable system wide have in $GITWEB_CONFIG
|
@@ -1166,18 +1167,8 @@ sub configure_gitweb_features {
|
1166 | 1167 | our @snapshot_fmts = gitweb_get_feature('snapshot');
|
1167 | 1168 | @snapshot_fmts = filter_snapshot_fmts(@snapshot_fmts);
|
1168 | 1169 |
|
1169 |
| - # check that the avatar feature is set to a known provider name, |
1170 |
| - # and for each provider check if the dependencies are satisfied. |
1171 |
| - # if the provider name is invalid or the dependencies are not met, |
1172 |
| - # reset $git_avatar to the empty string. |
1173 | 1170 | our ($git_avatar) = gitweb_get_feature('avatar');
|
1174 |
| - if ($git_avatar eq 'gravatar') { |
1175 |
| - $git_avatar = '' unless (eval { require Digest::MD5; 1; }); |
1176 |
| - } elsif ($git_avatar eq 'picon') { |
1177 |
| - # no dependencies |
1178 |
| - } else { |
1179 |
| - $git_avatar = ''; |
1180 |
| - } |
| 1171 | + $git_avatar = '' unless $git_avatar =~ /^(?:gravatar|picon)$/s; |
1181 | 1172 |
|
1182 | 1173 | our @extra_branch_refs = gitweb_get_feature('extra-branch-refs');
|
1183 | 1174 | @extra_branch_refs = filter_and_validate_refs (@extra_branch_refs);
|
@@ -2167,7 +2158,7 @@ sub gravatar_url {
|
2167 | 2158 | my $size = shift;
|
2168 | 2159 | $avatar_cache{$email} ||=
|
2169 | 2160 | "//www.gravatar.com/avatar/" .
|
2170 |
| - Digest::MD5::md5_hex($email) . "?s="; |
| 2161 | + md5_hex($email) . "?s="; |
2171 | 2162 | return $avatar_cache{$email} . $size;
|
2172 | 2163 | }
|
2173 | 2164 |
|
|
0 commit comments