diff --git a/modules/openlayers_views/views/openlayers_views_style_data.inc b/modules/openlayers_views/views/openlayers_views_style_data.inc index aaf50c5..83b7cc6 100644 --- a/modules/openlayers_views/views/openlayers_views_style_data.inc +++ b/modules/openlayers_views/views/openlayers_views_style_data.inc @@ -293,17 +293,19 @@ class openlayers_views_style_data extends views_plugin_style { $attributes[$hid] = isset($handler->original_value) ? $handler->original_value : NULL; } } - - // Handle rendering the whole record. - if ($this->options['data_source']['description_field'] === '#row') { - $attributes['#row_rendered'] = $this->row_plugin->render($record); - } - - // Handle rendering of a node view. - if ($this->options['data_source']['description_field'] === '#node' && - is_object($record) && isset($record->nid)) { - $view_mode = $this->options['data_source']['view_mode'] ? $this->options['data_source']['view_mode'] : 'full'; - $attributes['#node_rendered'] = drupal_render(node_view(node_load($record->nid), $view_mode)); + + if (isset($this->options['data_source']['description_field'])) { + // Handle rendering the whole record. + if ($this->options['data_source']['description_field'] === '#row') { + $attributes['#row_rendered'] = $this->row_plugin->render($record); + } + + // Handle rendering of a node view. + if ($this->options['data_source']['description_field'] === '#node' && + is_object($record) && isset($record->nid)) { + $view_mode = $this->options['data_source']['view_mode'] ? $this->options['data_source']['view_mode'] : 'full'; + $attributes['#node_rendered'] = drupal_render(node_view(node_load($record->nid), $view_mode)); + } } // Create features array. @@ -493,12 +495,14 @@ class openlayers_views_style_data extends views_plugin_style { // Create description attribute. Note that there are a couple // exceptions to using fields $exceptions = array('#row', '#node'); - if (in_array($ds['description_field'], $exceptions) || isset($handlers[$ds['description_field']])) { - $f['attributes']['description'] = $f['attributes'][$ds['description_field'] . '_rendered']; - - // Remove rendered row to keep data size down for JS. - if (in_array($ds['description_field'], $exceptions)) { - unset($f['attributes'][$ds['description_field'] . '_rendered']); + if (isset($ds['description_field'])) { + if (in_array($ds['description_field'], $exceptions) || isset($handlers[$ds['description_field']])) { + $f['attributes']['description'] = $f['attributes'][$ds['description_field'] . '_rendered']; + + // Remove rendered row to keep data size down for JS. + if (in_array($ds['description_field'], $exceptions)) { + unset($f['attributes'][$ds['description_field'] . '_rendered']); + } } } }