? .git
Index: plugins/views_plugin_display.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display.inc,v
retrieving revision 1.20.2.17
diff -u -p -r1.20.2.17 views_plugin_display.inc
--- plugins/views_plugin_display.inc	18 Nov 2009 20:27:27 -0000	1.20.2.17
+++ plugins/views_plugin_display.inc	21 Nov 2009 16:43:02 -0000
@@ -2073,9 +2073,12 @@ class views_plugin_display extends views
         return;
       }
       $this->view->init_handlers();
-      return array(
-        'content' => $this->view->render_exposed_form(TRUE),
-      );
+      if ($this->uses_exposed()) {
+        $exposed_form = $this->get_plugin('exposed_form');
+        return array(
+          'content' => $exposed_form->render_exposed_form(TRUE),
+        );
+      }
     }
   }