From 60dbc4f4d766a8ae3698e190e89c2f8005ec01d7 Mon Sep 17 00:00:00 2001 From: Sudhir Krishna S Date: Tue, 2 Aug 2011 14:29:56 +0530 Subject: [PATCH 1/2] Issue 1236610: allows inherited calendar plugin row node to be used --- includes/calendar_plugin_style.inc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/includes/calendar_plugin_style.inc b/includes/calendar_plugin_style.inc index 047a293..4bde8c1 100644 --- a/includes/calendar_plugin_style.inc +++ b/includes/calendar_plugin_style.inc @@ -207,7 +207,10 @@ class calendar_plugin_style extends views_plugin_style { } function render() { - if (empty($this->row_plugin) || $this->row_plugin->definition['handler'] != 'calendar_plugin_row_node') { + //check if the handler is a derived version of calendar_plugin_row_node + //ideally this must be done by checking type of the handler. instead here naming convention is used + //the derived handler must have calendar_plugin_row_node in it's name for this to work. + if (empty($this->row_plugin) || strpos($this->row_plugin->definition['handler'], 'calendar_plugin_row_node') === FALSE) { debug('calendar_plugin_style: Missing calendar row plugin'); return; } -- 1.7.4.msysgit.0 From feafd3108f0532b05669cb4b1f6ea1f23d290f66 Mon Sep 17 00:00:00 2001 From: Sudhir Krishna S Date: Sun, 7 Aug 2011 12:48:39 +0530 Subject: [PATCH 2/2] Updated to use instanceof instead of string comparison --- includes/calendar_plugin_style.inc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/includes/calendar_plugin_style.inc b/includes/calendar_plugin_style.inc index 4bde8c1..12e72dc 100644 --- a/includes/calendar_plugin_style.inc +++ b/includes/calendar_plugin_style.inc @@ -208,9 +208,7 @@ class calendar_plugin_style extends views_plugin_style { function render() { //check if the handler is a derived version of calendar_plugin_row_node - //ideally this must be done by checking type of the handler. instead here naming convention is used - //the derived handler must have calendar_plugin_row_node in it's name for this to work. - if (empty($this->row_plugin) || strpos($this->row_plugin->definition['handler'], 'calendar_plugin_row_node') === FALSE) { + if (empty($this->row_plugin) || $this->row_plugin->definition['handler'] instanceof calendar_plugin_row_node) { debug('calendar_plugin_style: Missing calendar row plugin'); return; } -- 1.7.4.msysgit.0