From 5272329fbc46206e4a8527026c0a8d33d2c0bc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Mon, 17 Dec 2007 15:05:10 +0000
Subject: rollback of #197425 following on Steven Witten's discontent on how it
 looks in Garland

---
 modules/filter/filter.module | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index a3fd7e913..4cb5eecc4 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -167,7 +167,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) {
   switch ($delta) {
     case 0:
       if (variable_get("filter_html_$format", FILTER_HTML_STRIP) ==  FILTER_HTML_STRIP) {
-        if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <blockquote> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) {
+        if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) {
           switch ($long) {
             case 0:
               return t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
@@ -662,7 +662,7 @@ function _filter_html_settings($format) {
   $form['filter_html']["allowed_html_$format"] = array(
     '#type' => 'textfield',
     '#title' => t('Allowed HTML tags'),
-    '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <blockquote> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
+    '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
     '#size' => 64,
     '#maxlength' => 255,
     '#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'),
@@ -687,7 +687,7 @@ function _filter_html_settings($format) {
  */
 function _filter_html($text, $format) {
   if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) {
-    $allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '<a> <em> <strong> <blockquote> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), -1, PREG_SPLIT_NO_EMPTY);
+    $allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), -1, PREG_SPLIT_NO_EMPTY);
     $text = filter_xss($text, $allowed_tags);
   }
 
-- 
cgit v1.2.3