Index: quote.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quote/quote.module,v
retrieving revision 1.29.2.10.2.1
diff -u -r1.29.2.10.2.1 quote.module
--- quote.module	28 Mar 2008 22:59:59 -0000	1.29.2.10.2.1
+++ quote.module	27 Apr 2009 23:30:09 -0000
@@ -101,6 +101,10 @@
     else {
       return;
     }
+    //added by Patch #node/243677
+    if (substr(trim($quote), 0, 3) == "<p>" && trim(substr(trim($quote), -4, 4) == "</p>")) {
+      $quote = substr(trim($quote), 3, -4);
+    }
     // Add quoted text and preserve existing content (signature etc.).
     $form['comment_filter']['comment']['#default_value'] = '[quote='. $author .']'. $quote ."[/quote]\n". $form['comment_filter']['comment']['#default_value'];
     if (_quote_variable_get('subject_required')) {
@@ -196,9 +200,16 @@
 function _quote_filter_process($text) {
   // Thanks: function based on code from punbb.org
   if (strstr($text, '[quote')) {
-    $pre = '<div class="quote-msg"><div class="quote-author">';
-    $post = '</div>';
+    //$pre = '<div class="quote-msg"><div class="quote-author">';
+    //$post = '</div>';
+    //$markup = $pre . t('Quote:') . $post;
+    //$text = str_replace(array('[quote]', '[quote=]', '[/quote]'), array($markup, $markup, $post), $text);
+    //$text = preg_replace('#\[quote=(?:"|\')?(.*?)["\']?(?:"|\')?\]#s', $pre . t('%name wrote:', array('%name' => '\\1')) . $post, $text);
+		//added by Patch #node/243677
+    $pre = '';
+    $post = '';
     $markup = $pre . t('Quote:') . $post;
+    $text = str_replace('[/quote]', '[/quote]', $text);
     $text = str_replace(array('[quote]', '[quote=]', '[/quote]'), array($markup, $markup, $post), $text);
     $text = preg_replace('#\[quote=(?:"|\')?(.*?)["\']?(?:"|\')?\]#s', $pre . t('%name wrote:', array('%name' => '\\1')) . $post, $text);
   }