diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-10-10 18:42:52 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-10-10 18:42:52 +0000 |
| commit | bcd2a1a44fa0b074c792610ccb867af2f0ead5aa (patch) | |
| tree | 8bf3f9f6609051a0afdbdab2d867ae6c28c67fbe /modules | |
| parent | f1fcfb9fc50960ce0e98867b22eedf13fa476dc4 (diff) | |
| download | brdo-bcd2a1a44fa0b074c792610ccb867af2f0ead5aa.tar.gz brdo-bcd2a1a44fa0b074c792610ccb867af2f0ead5aa.tar.bz2 | |
- Patch #600422 by alpritt: fixed WSOD.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index d7650ae9f..4540efc74 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -831,8 +831,8 @@ class TaxonomyTermController extends DrupalDefaultEntityController { $this->query->addField('v', 'machine_name', 'vocabulary_machine_name'); } - protected function cacheGet($ids) { - $terms = parent::cacheGet($ids); + protected function cacheGet($ids, $conditions = array()) { + $terms = parent::cacheGet($ids, $conditions); // Name matching is case insensitive, note that with some collations // LOWER() and drupal_strtolower() may return different results. foreach ($terms as $term) { |