Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #432154 by Berdir: fixed bug in taxonomy_vocabulary_load_multiple. With tests.

merge-requests/26/head
Dries Buytaert 2009-04-13 18:52:38 +00:00
parent d79481b3a0
commit 31dbee5459
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/taxonomy/taxonomy.module
View File

@ -1019,7 +1019,7 @@ function taxonomy_vocabulary_load_multiple($vids = array(), $conditions = array(
$query->orderBy('v.name'); $query->orderBy('v.name');
if (!empty($type)) { if (!empty($type)) {
$query->leftJoin('taxonomy_vocabulary_node_type', 'n', 'v.vid = n.vid WHERE n.type = :type', array(':type' => $type)); $query->leftJoin('taxonomy_vocabulary_node_type', 'n', 'v.vid = n.vid AND n.type = :type', array(':type' => $type));
} }
else { else {
$query->leftJoin('taxonomy_vocabulary_node_type', 'n', 'v.vid = n.vid'); $query->leftJoin('taxonomy_vocabulary_node_type', 'n', 'v.vid = n.vid');

5
modules/taxonomy/taxonomy.test
View File

@ -276,6 +276,11 @@ public static function getInfo() {
// Fetch vocabulary 1 by name and ID. // Fetch vocabulary 1 by name and ID.
$this->assertTrue(current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('name' => $vocabulary1->name))) == $vocabulary1, t('Vocabulary loaded successfully by name and ID.')); $this->assertTrue(current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('name' => $vocabulary1->name))) == $vocabulary1, t('Vocabulary loaded successfully by name and ID.'));
// Fetch vocabulary 1 with specified node type.
drupal_static_reset('taxonomy_vocabulary_load_multiple');
$vocabulary_node_type = current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('type' => 'article')));
$this->assertEqual($vocabulary_node_type, $vocabulary1, t('Vocabulary with specified node type loaded successfully.'));
} }
} }