diff options
| -rw-r--r-- | modules/filter.module | 6 | ||||
| -rw-r--r-- | modules/filter/filter.module | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/modules/filter.module b/modules/filter.module index 7697c266b..41a968f52 100644 --- a/modules/filter.module +++ b/modules/filter.module @@ -45,7 +45,7 @@ function filter_help($section) { /** * Implementation of hook_filter_tips(). */ -function filter_filter_tips($delta, $format, $type = false) { +function filter_filter_tips($delta, $format, $long = false) { switch ($delta) { case 0: switch (variable_get("filter_html_$format", FILTER_HTML_STRIP)) { @@ -852,10 +852,6 @@ function _filter_html($text, $format) { $text = htmlspecialchars($text); } - if (variable_get("filter_nl2br_$format", true)) { - $text = _filter_autop($text, true); - } - return trim($text); } diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 7697c266b..41a968f52 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -45,7 +45,7 @@ function filter_help($section) { /** * Implementation of hook_filter_tips(). */ -function filter_filter_tips($delta, $format, $type = false) { +function filter_filter_tips($delta, $format, $long = false) { switch ($delta) { case 0: switch (variable_get("filter_html_$format", FILTER_HTML_STRIP)) { @@ -852,10 +852,6 @@ function _filter_html($text, $format) { $text = htmlspecialchars($text); } - if (variable_get("filter_nl2br_$format", true)) { - $text = _filter_autop($text, true); - } - return trim($text); } |