From 7bf11509a3bcddda6f65c6a00913573e776a6160 Mon Sep 17 00:00:00 2001 From: dbs Date: Fri, 9 Apr 2010 03:38:26 +0000 Subject: [PATCH] Fix call to JSON2perl meant to make JS regex happy in Perl 1. Package name was wrong; fixed 2. Commented the whole call out because JSON2perl was failing miserably git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16190 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Actor.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index ccf961612a..3c2b9cbf52 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -3535,10 +3535,11 @@ sub commit_password_reset { my $is_strong = 0; if ($pw_regex) { - ($pw_regex = OpenSRF::Util::JSON->JSON2perl($pw_regex)) =~ s/\\u([0-9a-fA-F]{4})/\\x{$1}/gs; - $is_strong = check_password_strength_custom($password, $pw_regex); + # Calling JSON2perl on the $pw_regex causes failure, even before the fancy Unicode regex + # ($pw_regex = OpenSRF::Utils::JSON->JSON2perl($pw_regex)) =~ s/\\u([0-9a-fA-F]{4})/\\x{$1}/gs; + $is_strong = check_password_strength_custom($password, $pw_regex); } else { - $is_strong = check_password_strength_default($password); + $is_strong = check_password_strength_default($password); } if (!$is_strong) { -- 2.11.0