rollback of #197425 following on Steven Witten's discontent on how it looks in Garland

5 files changed, 3 insertions, 36 deletions

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);
   }
 
diff --git a/themes/bluemarine/style-rtl.css b/themes/bluemarine/style-rtl.css
index 9c63297cd..ef3c46905 100644
--- a/themes/bluemarine/style-rtl.css
+++ b/themes/bluemarine/style-rtl.css
@@ -2,13 +2,6 @@
 body {
   direction: rtl;
 }
-blockquote {
-  padding: 0 15px 0 0;
-  margin: 1.1em 35px 1.1em 40px;
-  border-left-style: none;
-  border-right-style: solid;
-  border-right-width: 4px;
-}
 #logo img {
   float: right;
 }
diff --git a/themes/bluemarine/style.css b/themes/bluemarine/style.css
index 9db6519af..c88def143 100644
--- a/themes/bluemarine/style.css
+++ b/themes/bluemarine/style.css
@@ -29,14 +29,6 @@ p {
   margin-top: 0.5em;
   margin-bottom: 0.9em;
 }
-blockquote {
-  padding: 0 0 0 15px; /* LTR */
-  margin: 1.1em 40px 1.1em 35px; /* LTR */
-  border-left-style: solid; /* LTR */
-  border-left-width: 4px; /* LTR */
-  border-color: #69c;
-  font-style: italic;
-}
 a {
   text-decoration: none;
   font-weight: bold;
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index f772ad6cf..791abf243 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -11,14 +11,6 @@ body {
   direction: rtl;
 }
 
-blockquote {
-  padding: 0 15px 0 0;
-  margin: 1.1em 35px 1.1em 40px;
-  border-left-style: none;
-  border-right-style: solid;
-  border-right-width: 4px;
-}
-
 ol li, ul li {
   margin: 0.4em .5em 0.4em 0;
 }
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 396eafbb2..cc882fca8 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -71,16 +71,6 @@ p {
   padding: 0;
 }
 
-blockquote {
-  padding: 0 0 0 15px; /* LTR */
-  margin: 1.1em 40px 1.1em 35px; /* LTR */
-  border-left-style: solid; /* LTR */
-  border-left-width: 4px; /* LTR */
-  /* Same as link color, keeps this colorable. */
-  border-color: #027AC6;
-  font-style: italic;
-}
-
 a:link, a:visited {
   color: #027AC6;
   text-decoration: none;