diff -u b/core/modules/entity/entity.module b/core/modules/entity/entity.module --- b/core/modules/entity/entity.module +++ b/core/modules/entity/entity.module @@ -56,9 +56,7 @@ return user_access('access content'); case 'taxonomy_term': - case 'taxonomy_vocabulary': - // There is no specific permission to allow access to vocabularies or - // terms so return TRUE. + // There is no specific access permission for terms so return TRUE. return TRUE; case 'user': @@ -100,6 +98,7 @@ ->addTag('node_access') ->addTag('translatable') ->execute(); + if (isset($result[$entity_type])) { $entities = entity_load_multiple($entity_type, array_keys($result[$entity_type])); foreach ($entities as $entity) { diff -u b/core/modules/entity/tests/entity.test b/core/modules/entity/tests/entity.test --- b/core/modules/entity/tests/entity.test +++ b/core/modules/entity/tests/entity.test @@ -251,7 +251,6 @@ * Tests Entity autocompletion. */ class EntityAutocompleteTestCase extends WebTestBase { - public static function getInfo() { return array( 'name' => 'Entity autocomplete', @@ -263,29 +262,20 @@ function setUp() { - $modules = func_get_args(); - if (isset($modules[0]) && is_array($modules[0])) { - $modules = $modules[0]; - } - $modules[] = 'node'; - // Ensure node module is loaded and configured. - parent::setUp($modules); + parent::setUp(array('node')); // Create Article node type. - if ($this->profile != 'standard') { - $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); - } + $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); } /** - * Tests autocompletion for entity type "node". + * Tests autocompletion for nodes. */ function testEntityAutocompleteNode() { - $user1 = $this->drupalCreateUser(array('edit own article content', 'create article content')); - $this->drupalLogin($user1); + $web_user = $this->drupalCreateUser(array('edit own article content', 'create article content')); + $this->drupalLogin($web_user); $this->drupalCreateNode(array('title' => 'invisibleink and Ron Williams')); $expected = '{"node\/1":"invisibleink and Ron Williams"}'; $result = $this->drupalGet('entity/autocomplete/node/invis'); - $this->assertIdentical($result, $expected, t('The autocomplete path returned the proper JSON object when acessing autocomplete URL')); + $this->assertIdentical($result, $expected); } - } diff -u b/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc --- b/core/modules/menu/menu.admin.inc +++ b/core/modules/menu/menu.admin.inc @@ -298,7 +298,7 @@ '#title' => t('Path'), '#maxlength' => 255, '#default_value' => $path, - '#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page. You may enter the title of the node you would like to link to to get a list of possible matches.', array('%front' => '', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')), + '#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page. Enter the title of a content to get a list of suggestions.', array('%front' => '', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')), '#autocomplete_path' => 'entity/autocomplete/node', '#required' => TRUE, );