contrib modules security updates

sites/all/modules/views/tests/views_module.test

@@ -194,6 +194,30 @@ class ViewsModuleTest extends ViewsSqlTest {
     $this->assertEqual(variable_get('views_test_views_data_count', 0), 1, 'Views data rebuilt once');
     $this->assertFalse(drupal_static('_views_fetch_data_fully_loaded'), 'Views data is not fully loaded');
 
+
+    // Test if the cache consistency is ensured. There was an issue where
+    // calling _views_fetch_data() first with a table would prevent the function
+    // from properly rebuilt a missing the general cache entry.
+    // See https://www.drupal.org/node/2475669 for details.
+    // Make sure we start with a empty cache.
+    $this->resetStaticViewsDataCache();
+    cache_clear_all('*', 'cache_views', TRUE);
+
+    // Prime the static cache of _views_fetch_data() by calling it with a table
+    // first.
+    views_fetch_data('views_test');
+    // Now remove the general cache.
+    cache_clear_all('views_data:en', 'cache_views');
+    // Reset the static cache to see if fetches from the persistent cache
+    // properly rebuild the static cache.
+    $this->resetStaticViewsDataCache();
+    // Prime the static cache of _views_fetch_data() by calling it with a table
+    // first.
+    views_fetch_data('views_test');
+    // Fetch the general cache, which was deleted, an see if it is rebuild
+    // properly.
+    views_fetch_data();
+    $this->assertTrue(cache_get('views_data:en', 'cache_views'), 'Cache for all tables was properly rebuild.');
   }
 
   /**