--- filter_variables_cmi-1799440-31.patch 2012-11-05 18:48:54.000000000 +0100 +++ filter_variables_cmi-1799440-32.patch 2012-11-06 08:00:46.000000000 +0100 @@ -120,15 +120,16 @@ + - webcal + - rtsp diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php -index e3cb1d0..9d370d6 100644 +index e3cb1d0..75a9a6e 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php -@@ -79,6 +79,14 @@ public function testVariableUpgrade() { +@@ -79,6 +79,15 @@ public function testVariableUpgrade() { 'cancel_method' => 'user_cancel_reassign', ); + $expected_config['system.filter'] = array( -+ 'protocols' => array('gopher', 'finger'), ++ 'protocols.0' => 'gopher', ++ 'protocols.1' => 'finger', + ); + + $expected_config['filter.settings'] = array( @@ -179,21 +180,28 @@ * The next series of updates should start at 9000. */ diff --git a/core/modules/system/tests/upgrade/drupal-7.system.database.php b/core/modules/system/tests/upgrade/drupal-7.system.database.php -index e9f31d3..7ebda45 100644 +index e9f31d3..ce5ab7e 100644 --- a/core/modules/system/tests/upgrade/drupal-7.system.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.system.database.php -@@ -94,6 +94,14 @@ +@@ -94,7 +94,11 @@ ->values(array( 'name' => 'user_cancel_method', 'value' => 's:20:"user_cancel_reassign"', +-)) + )) +->values(array( + 'name' => 'filter_allowed_protocols', + 'value' => 'a:2:{i:0;s:6:"gopher";i:1;s:6:"finger";}', + )) -+->values(array( -+ 'name' => 'filter_fallback_format', -+ 'value' => 's:12:"pagan_poetry";', - )) ->execute(); + db_update('variable') +@@ -105,4 +109,8 @@ + ->fields(array('value' => 's:22:"Testing config upgrade";')) + ->condition('name', 'site_name') + ->execute(); ++db_update('variable') ++ ->fields(array('value' => 's:12:"pagan_poetry";')) ++ ->condition('name', 'filter_fallback_format') ++ ->execute(); +