rpms/drupal-date/F-12 date-6.x-2.x-549884-30.patch, NONE, 1.1 drupal-date.spec, 1.6, 1.7

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/drupal-date/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13198

Modified Files:
	drupal-date.spec 
Added Files:
	date-6.x-2.x-549884-30.patch 
Log Message:
PHP 5.3 fix.


date-6.x-2.x-549884-30.patch:
 date_plugin_display_attachment.new.inc |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE date-6.x-2.x-549884-30.patch ---
--- includes/date_plugin_display_attachment.inc	2009-11-10 08:47:36.000000000 -0500
+++ includes/date_plugin_display_attachment.new.inc	2009-11-10 08:42:22.000000000 -0500
@@ -19,16 +19,16 @@ class date_plugin_display_attachment ext
     return parent::defaultable_sections($section);
   }
 
-  function options(&$display) {
+  function options($display) {
     parent::options($display);
-    $display->display_options['style_plugin'] = 'date_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']['style_plugin'] = 'date_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;
   } 
 }
 


Index: drupal-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/F-12/drupal-date.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- drupal-date.spec	16 Sep 2009 16:28:14 -0000	1.6
+++ drupal-date.spec	27 Jan 2010 19:31:08 -0000	1.7
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-date
 Version:  6.x.2.4
-Release:  0%{?dist}
+Release:  1%{?dist}
 Summary:  This package contains both the Date module and a Date API module
 
 Group: Applications/Publishing
@@ -9,6 +9,7 @@ License: GPLv2
 URL: http://drupal.org/project/date
 Source0: http://ftp.drupal.org/files/projects/date-6.x-2.4.tar.gz
 Source1: drupal-date-fedora-README.txt
+Patch0: date-6.x-2.x-549884-30.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,8 @@ the Date API module. 
 
 %setup -qn date
 
+%patch0 -p0
+
 %build
 
 cp %{SOURCE1} .
@@ -47,6 +50,9 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/date/date_php4/
 
 %changelog
+* Wed Jan 27 2010 Jon Ciesla <limb at jcomserv.net> - 6.x.2.4-1
+- Patch for PHP 5.3, BZ 559255.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.4-0
 - Update to new version.
 - Fix for DRUPAL-SA-CONTRIB-2009-057.