#765296: field IDs could get out of sync, causing render path to try to render a...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 12994fc..6aa4fe2 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Views 2.10
     o #765352: Fix for postgress versions prior to 8.3 which caused data loss in update.php. Note: This will not repair lost data. If you experienced this you must restore your views_display table from backup.
     o #766046: Live preview broken right after adding new display.
     o #740130: #561892 not applied correctly, caused the 'rewrite' checkbox to be ignored and rewrite always used.
+    o #765296: field IDs could get out of sync, causing render path to try to render a field that did not exist leading to whitescreens.
 
 Views 2.9 (Apr 07, 2010)
   Bug fixes:

diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc
index b6ee626..fab8cd0 100644 (file)
--- a/plugins/views_plugin_display.inc
+++ b/plugins/views_plugin_display.inc
@@ -572,6 +572,10 @@ class views_plugin_display extends views_plugin {
       $types = views_object_types();
       $plural = $types[$type]['plural'];
       foreach ($this->get_option($plural) as $id => $info) {
+        if ($info['id'] != $id) {
+          $info['id'] = $id;
+        }
+
         $handler = views_get_handler($info['table'], $info['field'], $type);
         if ($handler) {
           $handler->init($this->view, $info);