Issue #1152320: User: ID (and other argument IDs) not present due to re-use of $plugi...

diff --git a/css/modal.css b/css/modal.css
index c81a0f2..66c4a1c 100644 (file)
--- a/css/modal.css
+++ b/css/modal.css
@@ -121,7 +121,6 @@ div.ctools-modal-content .option-text-aligner label.hidden-options {
   background: none;
 }
 
-
 div.ctools-modal-content .dependent-options {
   padding-left: 30px;
 }

diff --git a/plugins/arguments/entity_id.inc b/plugins/arguments/entity_id.inc
index 69b3788..451d444 100644 (file)
--- a/plugins/arguments/entity_id.inc
+++ b/plugins/arguments/entity_id.inc
@@ -23,10 +23,11 @@ function ctools_argument_entity_id_get_child($plugin, $parent, $child) {
   return $plugins[$parent . ':' . $child];
 }
 
-function ctools_argument_entity_id_get_children($plugin, $parent) {
+function ctools_argument_entity_id_get_children($original_plugin, $parent) {
   $entities = entity_get_info();
   $plugins = array();
   foreach ($entities as $entity_type => $entity) {
+    $plugin = $original_plugin;
     $plugin['title'] = t('@entity: ID', array('@entity' => $entity['label']));
     $plugin['keyword'] = $entity_type;
     $plugin['description'] = t('Creates @entity context from an ID argument.', array('@entity' => $entity_type));