#1013170 by das-peter: Fix broken view::preview which was broken on #1001542.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b74cab4..70a6b53 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -108,6 +108,7 @@ Views 2.x-dev
     o #996486 by geoffreyr: Improperly written SQL could crash when rewritten by tac_lite.
     o #953718 by linclark: Register the special "broken" handlers for use with fields without handlers.
     o #722330 by dereine: Views should include core version for updates.
+    o #1013170 by das-peter: Fix broken view::preview which was broken on #1001542.
 
   New features
     o #841260: Introduce a field to evaluate math expressions. Relies on CTools 1.7 (not yet released).

diff --git a/includes/view.inc b/includes/view.inc
index 50a7dd8..707ab8b 100644 (file)
--- a/includes/view.inc
+++ b/includes/view.inc
@@ -948,7 +948,7 @@ class view extends views_db_object {
    * normalized output.
    */
   function preview($display_id = NULL, $args = array()) {
-    if (empty($this->current_display) || $this->current_display != $display_id) {
+    if (empty($this->current_display) || ((!empty($display_id)) && $this->current_display != $display_id)) {
       if (!$this->set_display($display_id)) {
         return FALSE;
       }