diff -r 7f621a3a9cbf -r 67a4c839c7e1 includes/wikiengine/render_xhtml.php
--- a/includes/wikiengine/render_xhtml.php	Sun Aug 09 01:26:57 2009 -0400
+++ b/includes/wikiengine/render_xhtml.php	Sun Aug 09 01:27:45 2009 -0400
@@ -114,12 +114,23 @@
     return $text;
   }
   
-  public function blockquote($text, $pieces)
+  public function blockquote($text)
+  {
+    return $text;
+  }
+  
+  public function blockquotepost($text, $rand_id)
   {
-    foreach ( $pieces as $i => $piece )
-    {
-      $text = str_replace(Carpenter::generate_token($i), "<blockquote>\n" . nl2br($piece) . "\n</blockquote>\n", $text);
-    }
+    $text = strtr($text, array(
+        "<p>{blockquote:$rand_id}<br />"  => '<blockquote>',
+        "<br />\n{/blockquote:$rand_id}</p>" => '</blockquote>',
+        "{blockquote:$rand_id}"  => '<blockquote>',
+        "{/blockquote:$rand_id}" => '</blockquote>'
+      ));
+    $text = strtr($text, array(
+        "<blockquote><br />" => '<blockquote>',
+        "</blockquote><br />" => '</blockquote>'
+      ));
     return $text;
   }