rpms/drupal-calendar/devel calendar-6.x-2.2-613528-5.patch, NONE, 1.1 drupal-calendar.spec, 1.1, 1.2

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/drupal-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12980

Modified Files:
	drupal-calendar.spec 
Added Files:
	calendar-6.x-2.2-613528-5.patch 
Log Message:
PHP 5.3 fix.


calendar-6.x-2.2-613528-5.patch:
 calendar_plugin_display_attachment.inc |    8 ++++----
 calendar_plugin_display_block.inc      |   18 +++++++++---------
 calendar_plugin_display_page.inc       |   18 +++++++++---------
 3 files changed, 22 insertions(+), 22 deletions(-)

--- NEW FILE calendar-6.x-2.2-613528-5.patch ---
diff -urp includes/calendar_plugin_display_attachment.inc new_includes/calendar_plugin_display_attachment.inc
--- includes/calendar_plugin_display_attachment.inc	2009-03-17 14:03:36.000000000 -0400
+++ new_includes/calendar_plugin_display_attachment.inc	2009-11-10 13:31:53.000000000 -0500
@@ -161,10 +161,10 @@ class calendar_plugin_display_attachment
    */
   function options(&$display) {
     parent::options($display);
-    $display->display_options['inherit_argments'] = TRUE;
-    $display->display_options['inherit_filters'] = TRUE;
-    $display->display_options['attachment_position'] = 'after';
-    $display->display_options['calendar_type'] = $this->calendar_type();
+    $display['display_options']['inherit_argments'] = TRUE;
+    $display['display_options']['inherit_filters'] = TRUE;
+    $display['display_options']['attachment_position'] = 'after';
+    $display['display_options']['calendar_type'] = $this->calendar_type();
   }  
 
   /**
diff -urp includes/calendar_plugin_display_block.inc new_includes/calendar_plugin_display_block.inc
--- includes/calendar_plugin_display_block.inc	2008-12-06 09:56:15.000000000 -0500
+++ new_includes/calendar_plugin_display_block.inc	2009-11-10 13:31:53.000000000 -0500
@@ -47,15 +47,15 @@ class calendar_plugin_display_block exte
 
   function options(&$display) {
     parent::options($display);
-    $display->display_options['displays'] = array();
-    $display->display_options['style_plugin'] = 'calendar_nav';
-    $display->display_options['items_per_page'] = 0;
-    $display->display_options['row_plugin'] = '';
-    $display->display_options['defaults']['style_plugin'] = FALSE;
-    $display->display_options['defaults']['style_options'] = FALSE;
-    $display->display_options['defaults']['items_per_page'] = FALSE;
-    $display->display_options['defaults']['row_plugin'] = FALSE;
-    $display->display_options['defaults']['row_options'] = FALSE;
+    $display['display_options']['displays'] = array();
+    $display['display_options']['style_plugin'] = 'calendar_nav';
+    $display['display_options']['items_per_page'] = 0;
+    $display['display_options']['row_plugin'] = '';
+    $display['display_options']['defaults']['style_plugin'] = FALSE;
+    $display['display_options']['defaults']['style_options'] = FALSE;
+    $display['display_options']['defaults']['items_per_page'] = FALSE;
+    $display['display_options']['defaults']['row_plugin'] = FALSE;
+    $display['display_options']['defaults']['row_options'] = FALSE;
   } 
   
   function option_definition () {
diff -urp includes/calendar_plugin_display_page.inc new_includes/calendar_plugin_display_page.inc
--- includes/calendar_plugin_display_page.inc	2009-11-10 13:21:09.000000000 -0500
+++ new_includes/calendar_plugin_display_page.inc	2009-11-10 13:31:53.000000000 -0500
@@ -44,15 +44,15 @@ class calendar_plugin_display_page exten
 
   function options(&$display) {
     parent::options($display);
-    $display->display_options['displays'] = array();
-    $display->display_options['style_plugin'] = 'calendar_nav';
-    $display->display_options['items_per_page'] = 0;
-    $display->display_options['row_plugin'] = '';
-    $display->display_options['defaults']['style_plugin'] = FALSE;
-    $display->display_options['defaults']['style_options'] = FALSE;
-    $display->display_options['defaults']['row_plugin'] = FALSE;
-    $display->display_options['defaults']['row_options'] = FALSE;
-    $display->display_options['defaults']['items_per_page'] = FALSE;
+    $display['display_options']['displays'] = array();
+    $display['display_options']['style_plugin'] = 'calendar_nav';
+    $display['display_options']['items_per_page'] = 0;
+    $display['display_options']['row_plugin'] = '';
+    $display['display_options']['defaults']['style_plugin'] = FALSE;
+    $display['display_options']['defaults']['style_options'] = FALSE;
+    $display['display_options']['defaults']['row_plugin'] = FALSE;
+    $display['display_options']['defaults']['row_options'] = FALSE;
+    $display['display_options']['defaults']['items_per_page'] = FALSE;
   } 
   
   function option_definition () {


Index: drupal-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-calendar/devel/drupal-calendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drupal-calendar.spec	7 Jan 2010 14:02:12 -0000	1.1
+++ drupal-calendar.spec	27 Jan 2010 19:29:51 -0000	1.2
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-calendar
 Version:  6.x.2.2
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  This module will display any Views date field in calendar formats
 
 Group: Applications/Publishing
@@ -9,6 +9,7 @@ License: GPLv2+
 URL: http://drupal.org/project/calendar
 Source0: http://ftp.drupal.org/files/projects/calendar-6.x-2.2.tar.gz
 Source1: drupal-calendar-fedora-README.txt
+Patch0: calendar-6.x-2.2-613528-5.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,8 @@ next navigation is provided for all view
 
 %setup -qn calendar
 
+%patch0 -p0
+
 %build
 
 cp %{SOURCE1} .
@@ -47,6 +50,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 27 2010 Jon Ciesla <limb at jcomserv.net> - 6.x.2.2-2
+- Patch to fix PHP 5.3 compatibility, BZ 559257.
+
 * Mon Jan 04 2010 Jon Ciesla <limb at jcomserv.net> - 6.x.2.2-1
 - Fixed license tag.