--- plugins-1869566-1.patch 2012-12-18 12:14:41.000000000 -0500 +++ plugins-1869566-2.patch 2012-12-18 12:56:07.000000000 -0500 @@ -1,17 +1,17 @@ -diff --git a/core/lib/Drupal/Core/Plugin/PluginBag.php b/core/lib/Drupal/Core/Plugin/PluginBag.php +diff --git a/core/lib/Drupal/Component/Plugin/PluginBag.php b/core/lib/Drupal/Component/Plugin/PluginBag.php new file mode 100644 -index 0000000..4f87330 +index 0000000..18b09d0 --- /dev/null -+++ b/core/lib/Drupal/Core/Plugin/PluginBag.php ++++ b/core/lib/Drupal/Component/Plugin/PluginBag.php @@ -0,0 +1,111 @@ +pluginInstances. + * -+ * @param string $plugin_id -+ * The ID of the plugin to initialize. ++ * @param string $instance_id ++ * The ID of the plugin instance to initialize. + */ -+ abstract protected function initializePlugin($plugin_id); ++ abstract protected function initializePlugin($instance_id); + + /** + * Implements \ArrayAccess::offsetExists(). + */ + public function offsetExists($offset) { -+ return isset($this->pluginInstances[$offset]) || isset($this->pluginIDs[$offset]); ++ return isset($this->pluginInstances[$offset]) || isset($this->instanceIDs[$offset]); + } + + /** @@ -82,21 +82,21 @@ index 0000000..4f87330 + * Implements \Iterator::next(). + */ + public function next() { -+ next($this->pluginIDs); ++ next($this->instanceIDs); + } + + /** + * Implements \Iterator::key(). + */ + public function key() { -+ return key($this->pluginIDs); ++ return key($this->instanceIDs); + } + + /** + * Implements \Iterator::valid(). + */ + public function valid() { -+ $key = key($this->pluginIDs); ++ $key = key($this->instanceIDs); + return $key !== NULL && $key !== FALSE; + } + @@ -104,26 +104,26 @@ index 0000000..4f87330 + * Implements \Iterator::rewind(). + */ + public function rewind() { -+ reset($this->pluginIDs); ++ reset($this->instanceIDs); + } + + /** + * Implements \Countable::count(). + */ + public function count() { -+ return count($this->pluginIDs); ++ return count($this->instanceIDs); + } + +} diff --git a/core/modules/views/lib/Drupal/views/DisplayArray.php b/core/modules/views/lib/Drupal/views/DisplayArray.php -index 35be37e..61a10f4 100644 +index 35be37e..eb5b23b 100644 --- a/core/modules/views/lib/Drupal/views/DisplayArray.php +++ b/core/modules/views/lib/Drupal/views/DisplayArray.php @@ -7,10 +7,12 @@ namespace Drupal\views; -+use Drupal\Core\Plugin\PluginBag; ++use Drupal\Component\Plugin\PluginBag; + /** * A class which wraps the displays of a view so you can lazy-initialize them. @@ -164,7 +164,7 @@ index 35be37e..61a10f4 100644 // Store all display IDs to access them easy and fast. $display = $this->view->storage->get('display'); - $this->displayIDs = drupal_map_assoc(array_keys($display)); -+ $this->pluginIDs = drupal_map_assoc(array_keys($display)); ++ $this->instanceIDs = drupal_map_assoc(array_keys($display)); } /** @@ -184,7 +184,7 @@ index 35be37e..61a10f4 100644 - * - * @param string $display_id - * The name of the display to initialize. -+ * Overrides \Drupal\Core\Plugin\PluginBag::initializePlugin(). ++ * Overrides \Drupal\Component\Plugin\PluginBag::initializePlugin(). */ - protected function initializeDisplay($display_id) { + protected function initializePlugin($display_id) {