diff options
| author | David Rothstein <drothstein@gmail.com> | 2013-08-05 23:22:21 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2013-08-05 23:22:21 -0400 |
| commit | 705eb17dea58d0bf06013e14748cf86168ed75d4 (patch) | |
| tree | e34bcb329cb55b1c4b1a6c4cc29618e443aa4d35 | |
| parent | eb13c0cec7fa5ccec202bcf7ec4f26e40b5365ec (diff) | |
| download | brdo-705eb17dea58d0bf06013e14748cf86168ed75d4.tar.gz brdo-705eb17dea58d0bf06013e14748cf86168ed75d4.tar.bz2 | |
Issue #2026269 by Spleshka: Fixed Different default values for filter_allowed_protocols() variable.
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | modules/filter/filter.module | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c56694ce8..1978e3985 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,8 @@ Drupal 7.23, xxxx-xx-xx (development version) ----------------------- +- Fixed inconsistent support for the 'tel' protocol in Drupal's URL filtering + functions. - Performance improvement: Allowed all hooks to be included in the module_implements() cache, even those that are only invoked on HTTP POST requests. diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 67b2c2f7f..2afe901e8 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -1461,7 +1461,7 @@ function _filter_url($text, $filter) { // we cannot cleanly differ between protocols here without hard-coding MAILTO, // so '//' is optional for all protocols. // @see filter_xss_bad_protocol() - $protocols = variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp')); + $protocols = variable_get('filter_allowed_protocols', array('ftp', 'http', 'https', 'irc', 'mailto', 'news', 'nntp', 'rtsp', 'sftp', 'ssh', 'tel', 'telnet', 'webcal')); $protocols = implode(':(?://)?|', $protocols) . ':(?://)?'; // Prepare domain name pattern. |