Replace newlines instead of inserting <br/> before them (part #36)

puzzle.php

@@ -197,15 +197,15 @@
 //------------------------------------------------------
 function displayPuzzleInfo($uid, $pid, $puzzleInfo)
 {
-    $title = nl2br($puzzleInfo['title']);
+    $title = nl2br2($puzzleInfo['title']);
     if ($title == NULL)
         $title = '(untitled)';
 
-    $summary = nl2br($puzzleInfo['summary']);
+    $summary = nl2br2($puzzleInfo['summary']);
     if ($summary == NULL)
         $summary = '(no summary)';
 
-    $description = nl2br($puzzleInfo['description']);
+    $description = nl2br2($puzzleInfo['description']);
     if ($description == NULL)
         $description = '(no description)';
 
@@ -1183,7 +1183,7 @@ function displayComments($uid, $pid, $lastVisit)
         if (USING_AWS) {
             $pcomment = str_replace("=\"uploads/", "=\"https://" . AWS_BUCKET . ".s3.amazonaws.com/uploads/", $pcomment);
         }
-        echo nl2br($pcomment);
+        echo nl2br2($pcomment);
         echo '</td>';
         echo '</tr>';
     }

test.php

@@ -289,7 +289,7 @@ function displayPrevFeedback($uid, $pid)
 
         echo '<tr class="feedback">';
         echo '<td class="feedback">' . $pf['time'] . '</td>';
-        echo '<td class="feedback">' . nl2br($cleanComment) . '</td>';
+        echo '<td class="feedback">' . nl2br2($cleanComment) . '</td>';
         echo '</tr>';
     }
 

utils.php

@@ -99,7 +99,12 @@ function postprodCanon($s)
     $s = preg_replace('/[^a-z0-9]+/', '_', $s);
     return trim($s, "_");
 }
-
+function nl2br2($s)
+{
+    // builtin nl2br inserts <br />s before newlines instead of replacing
+    // which makes line breaks in <pre> tags get doubled
+    return str_replace("\n", '<br />', $s);
+}
 function postprodCanonRound($s)
 {
     return postprodCanon($s);