From a59daf1c68a5416c41a4a224339750388844f8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Delaune?= Date: Wed, 20 Mar 2013 10:54:46 +0100 Subject: [PATCH 1/2] [PASSED QA] Bug 9859: fix nsb_clean side effect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathieu Saby This sub was causing 2 bugs : - tools/exports.pl --clean was removing  - authority search plugin used in cataloging was removing  in suggested authorities displayed dynamicly (using ajax) After applying the patch, - NSB/NSE are still removed by nsb_clean - tools/exports.pl --clean is no more removing  - authority search plugins is no more removing  Signed-off-by: Katrin Fischer --- C4/Charset.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/C4/Charset.pm b/C4/Charset.pm index 2950a71..9be9788 100644 --- a/C4/Charset.pm +++ b/C4/Charset.pm @@ -415,11 +415,8 @@ sub nsb_clean { # handles non sorting blocks my ($string) = @_ ; $_ = $string ; - s/$NSB//g ; - s/$NSE//g ; - s/$NSB2//g ; - s/$NSE2//g ; - s/$C2//g ; + s/($C2){0,1}($NSB|$NSB2)//g ; + s/($C2){0,1}($NSE|$NSE2)//g ; $string = $_ ; return($string) ; -- 1.9.1