Store entity information in EntityReference_SelectionHandler

That makes sense.

-  protected function __construct($field, $instance) {
+  protected function __construct($field, $instance, $entity_type, $entity) {

Let's make those optional too, to make sure people understand that they might not be available.

I know, but let's make those optional too, to make sure people understand that they might not be available :)

#1541672: Don't check "create" access in OgSelectionHandler::buildEntityFieldQuery() now depends on this.

-function entityreference_options_list($field, $instance = NULL) {
-  return entityreference_get_selection_handler($field, $instance)->getReferencableEntities();
+function entityreference_options_list($field, $instance = NULL, $entity_type = NULL, $entity = NULL) {
+  return entityreference_get_selection_handler($field, $instance, $entity_type, $entity)->getReferencableEntities();

Thinking about this more, shouldn't we just add $entity_type and $entity as (optional) parameters to the ->getReferencableEntities()? Amitai, any thoughts?

> shouldn't we just add $entity_type and $entity as (optional) parameters to the ->getReferencableEntities()?

Indeed, at the beginning I thought about this option, however, I was thinking it is possible that one would call also validateReferencableEntities() needing the entity. Maybe also on entityFieldQueryAlter().
So I think that the proposed solution is more future proof to feature requests.

Ok, in that case, we need to fix or remove the caching in entityreference_get_selection_handler(). I just removed it in the attached patch and added some more context where we have it.

We still need to figure out how to pass the entity context to entityreference_autocomplete_callback().

> we need to fix or remove the caching in entityreference_get_selection_handler()

Damz, what do you think about this caching? (attached interdiff)

Damz, what do you think about this caching? (attached interdiff)

I started writing something like that, then decided that it was not worth it. We can decide later, can we focus on the autocomplete callback?

Patch (based on #9 -- without objet cache) adds optional $entity to autocomplete.

#13 looks good to me on visual inspection. Let's move forward with it and tag a rc2.

I ended up committing the following patch with some minor fixes.

+++ b/entityreference.moduleundefined
@@ -680,25 +673,36 @@ function entityreference_field_widget_form(&$form, &$form_state, $field, $instan
+    unset($entity->nid);

Is this a debug leftover?

#17 seems to be fixed -- http://drupalcode.org/project/entityreference.git/commitdiff/099f8e94216...

It was, I quickly tested what happens with unsaved entities. I caught it in time :)