Issue #2026269 by Spleshka: Fixed Different default values for filter…

…_allowed_protocols() variable.
kalamuna · Aug 6, 2013 · 705eb17 · 705eb17
1 parent eb13c0c
commit 705eb17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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.