PyukiWiki CVS Commit
pyuki****@lists*****
2012年 4月 26日 (木) 21:50:22 JST
Index: PyukiWiki-Devel/lib/Nana/MD5.pm diff -u PyukiWiki-Devel/lib/Nana/MD5.pm:1.66 PyukiWiki-Devel/lib/Nana/MD5.pm:1.67 --- PyukiWiki-Devel/lib/Nana/MD5.pm:1.66 Thu Apr 12 06:31:01 2012 +++ PyukiWiki-Devel/lib/Nana/MD5.pm Thu Apr 26 21:50:22 2012 @@ -1,8 +1,8 @@ ###################################################################### # MD5.pm - This is PyukiWiki, yet another Wiki clone. -# $Id: MD5.pm,v 1.66 2012/04/11 21:31:01 papu Exp $ +# $Id: MD5.pm,v 1.67 2012/04/26 12:50:22 papu Exp $ # -# "Nana::MD5" ver 0.1 $$ +# "Nana::MD5" ver 0.2 $$ # Author: Nanami # http://nanakochi.daiba.cx/ # Copyright (C) 2004-2012 Nekyo @@ -29,17 +29,31 @@ @EXPORT_OK = qw(md5 md5_hex md5_base64); @ISA = 'Exporter'; -$VERSION = '0.1'; +$VERSION = '0.2'; $MD5::Method=""; my $funcp = $::functions{"load_module"}; -if(&$funcp("Digest::MD5")) { - $MD5::Method="Digest::MD5"; -} elsif(&$funcp("Digest::Perl::MD5")) { +my $ret; + +eval { + $ret=&$funcp("Digest::MD5"); +}; +if($ret eq undef) { + eval { + $ret=&$funcp("Digest::Perl::MD5"); + }; $MD5::Method="Digest::Perl::MD5"; +} else { + $MD5::Method="Digest::MD5"; } +#if(&$funcp("Digest::MD5")) { +# $MD5::Method="Digest::MD5"; +#} elsif(&$funcp("Digest::Perl::MD5")) { +# $MD5::Method="Digest::Perl::MD5"; +#} + sub md5 { if($MD5::Method eq "Digest::MD5") { return Digest::MD5::md5(@_);
