--- filter_variables_cmi-1799440-22.patch	2012-11-01 02:17:43.000000000 +0100
+++ filter_variables_cmi-1799440-30.patch	2012-11-05 18:03:19.000000000 +0100
@@ -1,5 +1,5 @@
 diff --git a/core/includes/common.inc b/core/includes/common.inc
-index 4c86953..a229c2c 100644
+index 540f42b..815bb77 100644
 --- a/core/includes/common.inc
 +++ b/core/includes/common.inc
 @@ -1295,7 +1295,7 @@ function drupal_strip_dangerous_protocols($uri) {
@@ -11,6 +11,13 @@
    }
  
    // Iteratively remove any invalid protocol found.
+diff --git a/core/modules/filter/config/filter.settings.yml b/core/modules/filter/config/filter.settings.yml
+new file mode 100644
+index 0000000..59c9eef
+--- /dev/null
++++ b/core/modules/filter/config/filter.settings.yml
+@@ -0,0 +1 @@
++fallback_format: plain_text
 diff --git a/core/modules/filter/filter.install b/core/modules/filter/filter.install
 index 9237ad1..f3c29a5 100644
 --- a/core/modules/filter/filter.install
@@ -44,7 +51,7 @@
 + * The next series of updates should start at 9000.
 + */
 diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
-index b55066f..7d0e204 100644
+index b55066f..01948b0 100644
 --- a/core/modules/filter/filter.module
 +++ b/core/modules/filter/filter.module
 @@ -639,7 +639,7 @@ function filter_fallback_format() {
@@ -61,7 +68,7 @@
    // 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 = array_flip(config('system.filter')->get('protocols'));
++  $protocols = config('system.filter')->get('protocols');
    $protocols = implode(':(?://)?|', $protocols) . ':(?://)?';
  
    // Prepare domain name pattern.
@@ -80,22 +87,15 @@
        '
  https://example.com,
  ftp://ftp.example.com,
-diff --git a/core/modules/filter/lib/Drupal/filter/config/filter.settings.yml b/core/modules/filter/lib/Drupal/filter/config/filter.settings.yml
-new file mode 100644
-index 0000000..59c9eef
---- /dev/null
-+++ b/core/modules/filter/lib/Drupal/filter/config/filter.settings.yml
-@@ -0,0 +1 @@
-+fallback_format: plain_text
 diff --git a/core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php
-index 506fed2..5175dc1 100644
+index 506fed2..1040a15 100644
 --- a/core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php
 +++ b/core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php
 @@ -68,6 +68,8 @@ protected function setUp() {
      // Set user agent to be consistent with WebTestBase.
      $_SERVER['HTTP_USER_AGENT'] = $this->databasePrefix;
  
-+    config('system.filter')->set('protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp'));
++    config('system.filter')->set('protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp'))->save();
 +
      $this->setup = TRUE;
    }
@@ -120,10 +120,10 @@
 +  - webcal
 +  - rtsp
 diff --git a/core/modules/system/system.install b/core/modules/system/system.install
-index 1f191ac..61a374f 100644
+index 5a96500..ce0e629 100644
 --- a/core/modules/system/system.install
 +++ b/core/modules/system/system.install
-@@ -2203,6 +2203,21 @@ function system_update_8032() {
+@@ -2200,6 +2200,21 @@ function system_update_8033() {
  }
  
  /**
@@ -135,7 +135,7 @@
 + *
 + * @ingroup config_upgrade
 + */
-+function system_update_8033() {
++function system_update_8034() {
 +  update_variables_to_config('system.filter', array(
 +    'filter_allowed_protocols' => 'protocols',
 +  ));