Commit 59e5caac authored by webchick's avatar webchick

Roll-back of #401956, which needs more discussion.

parent 0f95dd45
......@@ -281,8 +281,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) {
case 4:
return t('No HTML tags allowed');
break;
case 5:
return t('Use [internal:foo/bar] to get a link to the internal page <em>foo/bar</em>.');
}
}
......@@ -606,14 +605,7 @@ function theme_filter_guidelines($format) {
function filter_filter($op, $delta = 0, $format = -1, $text = '') {
switch ($op) {
case 'list':
return array(
0 => t('Limit allowed HTML tags'),
1 => t('Convert line breaks'),
2 => t('Convert URLs into links'),
3 => t('Correct broken HTML'),
4 => t('Escape all HTML'),
5 => t('Create internal URLs'),
);
return array(0 => t('Limit allowed HTML tags'), 1 => t('Convert line breaks'), 2 => t('Convert URLs into links'), 3 => t('Correct broken HTML'), 4 => t('Escape all HTML'));
case 'description':
switch ($delta) {
......@@ -627,8 +619,6 @@ function filter_filter($op, $delta = 0, $format = -1, $text = '') {
return t('Corrects faulty and chopped off HTML in postings.');
case 4:
return t('Escapes all HTML tags, so they will be visible instead of being effective.');
case 5:
return t('Formats [internal:node/1234] as a URL.');
default:
return;
}
......@@ -645,8 +635,6 @@ function filter_filter($op, $delta = 0, $format = -1, $text = '') {
return _filter_htmlcorrector($text);
case 4:
return trim(check_plain($text));
case 5:
return _filter_internal($text);
default:
return $text;
}
......@@ -865,18 +853,6 @@ function _filter_url_trim($text, $length = NULL) {
return $text;
}
/**
* Turn [internal:foo] into url(foo).
*
* @param $text
* The text to apply the filter on.
* @return
* The filtered text.
*/
function _filter_internal($text) {
return preg_replace('/\[internal:([^\]]+)\]/e', "url('\\1')", $text);
}
/**
* Convert line breaks into <p> and <br> in an intelligent fashion.
* Based on: http://photomatt.net/scripts/autop
......
......@@ -184,7 +184,7 @@ class FilterTestCase extends DrupalWebTestCase {
function getInfo() {
return array(
'name' => t('Core filters'),
'description' => t('Filter each filter individually: Convert URLs into links, Convert line breaks, Correct broken HTML, Escape all HTML, Limit allowed HTML tags, check the internal filter.'),
'description' => t('Filter each filter individually: Convert URLs into links, Convert line breaks, Correct broken HTML, Escape all HTML, Limit allowed HTML tags.'),
'group' => t('Filter'),
);
}
......@@ -233,11 +233,4 @@ class FilterTestCase extends DrupalWebTestCase {
$this->drupalPost('admin/settings/filter/delete/' . $format->format, array(), t('Delete'));
}
}
/**
* Unit test for the internal link filter.
*/
function testInternalFilter() {
$this->assertEqual(_filter_internal('[internal:foo/bar] [internal:foo2/bar2]'), url('foo/bar') . ' ' . url('foo2/bar2'), t('The internal filter works'));
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment