From: mkanat%kerio.com <>
Date: Thu, 12 Jan 2006 15:03:46 +0000 (+0000)
Subject: Bug 322771: PostgreSQL incorrectly detects that some summaries have control character... 
X-Git-Tag: bugzilla-2.22rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6930e2afb8af2a784f2c9ff6af3a8be6ee9a8920;p=thirdparty%2Fbugzilla.git

Bug 322771: PostgreSQL incorrectly detects that some summaries have control characters when they don't
Patch By Frederic Buclin <LpSolit@gmail.com> r=mkanat, a=justdave
---

diff --git a/checksetup.pl b/checksetup.pl
index 847ada5bbf..4ec455efa8 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -4245,17 +4245,22 @@ $dbh->bz_alter_column('logincookies', 'cookie',
 my $controlchar_bugs =
     $dbh->selectall_arrayref("SELECT short_desc, bug_id FROM bugs WHERE " .
                              $dbh->sql_regexp('short_desc', "'[[:cntrl:]]'"));
-if (@$controlchar_bugs)
+if (scalar(@$controlchar_bugs))
 {
-    print 'Cleaning control characters from bug summaries...';
+    my $msg = 'Cleaning control characters from bug summaries...';
+    my $found = 0;
     foreach (@$controlchar_bugs) {
         my ($short_desc, $bug_id) = @$_;
-        print " $bug_id...";
-        $short_desc = clean_text($short_desc);
-        $dbh->do("UPDATE bugs SET short_desc = ? WHERE bug_id = ?",
-                 undef, $short_desc, $bug_id);
+        my $clean_short_desc = clean_text($short_desc);
+        if ($clean_short_desc ne $short_desc) {
+            print $msg if !$found;
+            $found = 1;
+            print " $bug_id...";
+            $dbh->do("UPDATE bugs SET short_desc = ? WHERE bug_id = ?",
+                      undef, $clean_short_desc, $bug_id);
+        }
     }
-    print " done.\n";
+    print " done.\n" if $found;
 }
 
 # If you had to change the --TABLE-- definition in any way, then add your