diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-17 15:05:10 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-17 15:05:10 +0000 |
| commit | 5272329fbc46206e4a8527026c0a8d33d2c0bc6e (patch) | |
| tree | 480494d97d43a7b8eea28a4abacbc763bac183a2 /modules | |
| parent | 29f443761f4dec428e7d98dafe6095f86ec89880 (diff) | |
| download | brdo-5272329fbc46206e4a8527026c0a8d33d2c0bc6e.tar.gz brdo-5272329fbc46206e4a8527026c0a8d33d2c0bc6e.tar.bz2 | |
rollback of #197425 following on Steven Witten's discontent on how it looks in Garland
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/filter/filter.module | 6 |
1 files changed, 3 insertions, 3 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); } |