summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Stjerneman2012-04-25 21:10:54 +0200
committerEmil Stjerneman2012-04-25 21:10:54 +0200
commit26352c48cd714ea9d10f7af6b6164c073696a42d (patch)
tree452cf372decbce6a0af622990691d6311fff15ac
parentf404676fea0a535bf0c4a2dc48e1bb489120b1d3 (diff)
Updated the changelog before new release.7.x-2.3
-rw-r--r--CHANGELOG.txt9
-rw-r--r--linkit.info1
-rw-r--r--plugins/linkit_plugins/linkit-plugin-entity.class.php13
3 files changed, 18 insertions, 5 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0746996..3624111 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,14 @@
Linkit x.x-x.x, xxxx-xx-xx
+Linkit 7.x-2.3, 2012-04-25
+------------------------------
+- Added feature #1511966: Autofocus in the search field.
+- Fixed issue #1508846: Token module support for terms does not handle the right
+ tokens.
+- Added entity module as a new dependency.
+- Fixed issue #1508148: Term autocompletion by bundle doesn't work.
+- Fixed issue #1508826: Warning: Invalid argument supplied for foreach() in
+ element_children().
Linkit 7.x-2.2, 2012-03-28
------------------------------
diff --git a/linkit.info b/linkit.info
index afa27dc..d24ddb0 100644
--- a/linkit.info
+++ b/linkit.info
@@ -3,6 +3,7 @@ description = Provides an easy interface for inserting links to internal content
core = 7.x
configure = admin/config/content/linkit
dependencies[] = ctools
+dependencies[] = entity
; Our plugins interfaces and abstract implementations.
diff --git a/plugins/linkit_plugins/linkit-plugin-entity.class.php b/plugins/linkit_plugins/linkit-plugin-entity.class.php
index 519e6fa..68ea06d 100644
--- a/plugins/linkit_plugins/linkit-plugin-entity.class.php
+++ b/plugins/linkit_plugins/linkit-plugin-entity.class.php
@@ -161,7 +161,11 @@ class LinkitPluginEntity extends LinkitPlugin {
$this->query->propertyCondition($this->entity_field_label,
'%' . db_like($this->serach_string) . '%', 'LIKE')
->addTag('linkit_entity_autocomplete')
- ->addTag('linkit_' . $this->plugin['name'] . '_autocomplete');
+ ->addTag('linkit_' . $this->plugin['entity_type'] . '_autocomplete');
+
+ // Add access tag for the query.
+ // There is also a runtime access check that uses entity_access().
+ $this->query->addTag($this->plugin['entity_type'] . '_access');
// Bundle check.
if (isset($this->entity_key_bundle) && isset($this->conf['bundles']) ) {
@@ -183,10 +187,9 @@ class LinkitPluginEntity extends LinkitPlugin {
$entities = entity_load($this->plugin['entity_type'], $ids);
foreach ($entities AS $entity) {
- // If we have the entity module enabled, we check the access againt the
- // definded entity access callback.
- if (module_exists('entity') && !entity_access('view', $this->plugin['entity_type'], $entity)) {
- // continue;
+ // Check the access againt the definded entity access callback.
+ if (!entity_access('view', $this->plugin['entity_type'], $entity)) {
+ continue;
}
$matches[] = array(