Changeset 1425

Show
Ignore:
Timestamp:
02/28/08 21:52:24 (5 months ago)
Author:
mpaschal
Message:

Defer these checks for packages as late as possible
BugzID: 66845

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/release-30/lib/MT/Util.pm

    r1411 r1425  
    492492 
    493493{ 
    494     my $Have_Entities = eval 'use HTML::Entities; 1' ? 1 : 0
     494    my $Have_Entities
    495495 
    496496    sub encode_html { 
     
    499499        $html =~ tr!\cM!!d; 
    500500        #Encode::_utf8_on($html) if MT->instance->charset eq 'utf-8'; 
     501        unless (defined($Have_Entities)) { 
     502            $Have_Entities = eval 'use HTML::Entities; 1' ? 1 : 0; 
     503        } 
    501504        if ($Have_Entities && !MT->config->NoHTMLEntities) { 
    502505            $html = HTML::Entities::encode_entities($html); 
     
    521524        return '' unless defined $html; 
    522525        $html =~ tr!\cM!!d; 
     526        unless (defined($Have_Entities)) { 
     527            $Have_Entities = eval 'use HTML::Entities; 1' ? 1 : 0; 
     528        } 
    523529        if ($Have_Entities && !MT->config->NoHTMLEntities) { 
    524530            $html = HTML::Entities::decode_entities($html); 
     
    15601566} 
    15611567 
     1568{ 
     1569my $has_crypt_dsa; 
    15621570sub dsa_verify { 
    15631571    my %param = @_; 
    15641572 
    1565     eval { 
    1566         require Crypt::DSA; 
    1567     }; 
    1568     my $has_crypt_dsa = $@ ? 0 : 1; 
    1569     $has_crypt_dsa = 0 if $param{ForcePerl}; 
    1570     if ($has_crypt_dsa) { 
     1573    unless (defined $has_crypt_dsa) { 
     1574        eval { 
     1575            require Crypt::DSA; 
     1576        }; 
     1577        $has_crypt_dsa = $@ ? 0 : 1; 
     1578    } 
     1579    if ($has_crypt_dsa && !$param{ForcePerl}) { 
    15711580        $param{Key} = bless $param{Key}, 'Crypt::DSA::Key'; 
    15721581        $param{Signature} = bless $param{Signature}, 'Crypt::DSA::Signature'; 
     
    16061615    return defined($result) ? $result == 0 : 0; 
    16071616    } 
     1617} 
    16081618} 
    16091619