From d1613d0116f7d6e459b77e5b7cff4a942f100b89 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 7 Jan 2013 13:40:02 +0000
Subject: [PATCH] Issue #1880834 by damiankloip, dawehner: Fixed Don't return
 all data from views_data() service when an invalid table is requested.

---
 .../lib/Drupal/views/Tests/ViewsDataTest.php     | 16 ++++++++++++++--
 .../views/lib/Drupal/views/ViewsDataCache.php    |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php
index 30ae82d0310..ee47515de10 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php
@@ -14,6 +14,13 @@ namespace Drupal\views\Tests;
  */
 class ViewsDataTest extends ViewUnitTestBase {
 
+  /**
+   * Stores the views data cache service used by this test.
+   *
+   * @var \Drupal\views\ViewsDataCache
+   */
+  protected $viewsDataCache;
+
   public static function getInfo() {
     return array(
       'name' => 'Table Data',
@@ -31,10 +38,15 @@ class ViewsDataTest extends ViewUnitTestBase {
     $table_name = 'views_test_data';
     $expected_data = $this->viewsData();
 
-    $data = drupal_container()->get('views.views_data')->get($table_name);
+    $this->viewsDataCache = drupal_container()->get('views.views_data');
+
+    $data = $this->viewsDataCache->get($table_name);
     $this->assertEqual($data, $expected_data[$table_name], 'Make sure fetching views data by table works as expected.');
 
-    $data = drupal_container()->get('views.views_data')->get();
+    $data = $this->viewsDataCache->get($this->randomName());
+    $this->assertTrue(empty($data), 'Make sure fetching views data for an invalid table returns empty.');
+
+    $data = $this->viewsDataCache->get();
     $this->assertTrue(isset($data[$table_name]), 'Make sure the views_test_data info appears in the total views data.');
     $this->assertEqual($data[$table_name], $expected_data[$table_name], 'Make sure the views_test_data has the expected values.');
   }
diff --git a/core/modules/views/lib/Drupal/views/ViewsDataCache.php b/core/modules/views/lib/Drupal/views/ViewsDataCache.php
index 4df7ff5a55c..2f3805149f2 100644
--- a/core/modules/views/lib/Drupal/views/ViewsDataCache.php
+++ b/core/modules/views/lib/Drupal/views/ViewsDataCache.php
@@ -105,6 +105,8 @@ class ViewsDataCache {
       if (isset($this->storage[$key])) {
         return $this->storage[$key];
       }
+      // If the key is invalid, return an empty array.
+      return array();
     }
     else {
       if (!$this->fullyLoaded) {