From bcd2a1a44fa0b074c792610ccb867af2f0ead5aa Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 10 Oct 2009 18:42:52 +0000
Subject: - Patch #600422 by alpritt: fixed WSOD.

---
 modules/taxonomy/taxonomy.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

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) {
-- 
cgit v1.2.3