Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Jan 2019 20:32:00 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490736 - in head/www/gallery2: . files
Message-ID:  <201901192032.x0JKW0Dp068660@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Jan 19 20:31:59 2019
New Revision: 490736
URL: https://svnweb.freebsd.org/changeset/ports/490736

Log:
  Fix PHP 7 issue
  
  - Bump PORTREVISION
  
  Obtained from:	https://github.com/bobosch/gallery2/commit/4ddfafa416ffe5babd95f2a6532742c3ec903275
  		https://github.com/bobosch/gallery2/commit/4fc50203a12b78217999df00759d70d283efce2f
  PR:		234557
  Submitted by:	Matthew Luckie <mjl@luckie.org.nz>

Added:
  head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php   (contents, props changed)
  head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class   (contents, props changed)
Modified:
  head/www/gallery2/Makefile

Modified: head/www/gallery2/Makefile
==============================================================================
--- head/www/gallery2/Makefile	Sat Jan 19 20:23:20 2019	(r490735)
+++ head/www/gallery2/Makefile	Sat Jan 19 20:31:59 2019	(r490736)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gallery2
 PORTVERSION=	2.3.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	SF/gallery/${PORTNAME}/${PORTVERSION}
 DISTNAME=	gallery-${PORTVERSION}-full

Added: head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php	Sat Jan 19 20:31:59 2019	(r490736)
@@ -0,0 +1,12 @@
+Obtained from:	https://github.com/bobosch/gallery2/commit/4ddfafa416ffe5babd95f2a6532742c3ec903275
+
+--- lib/adodb/adodb-time.inc.php.orig
++++ lib/adodb/adodb-time.inc.php
+@@ -1006,7 +1006,6 @@ function adodb_tz_offset($gmt,$isphp5)
+ 		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+ 	else
+ 		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+-	break;
+ }
+ 
+ 

Added: head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class	Sat Jan 19 20:31:59 2019	(r490736)
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/bobosch/gallery2/commit/4fc50203a12b78217999df00759d70d283efce2f
+
+--- modules/core/classes/GalleryStorage/GalleryStorageExtras.class.orig
++++ modules/core/classes/GalleryStorage/GalleryStorageExtras.class
+@@ -190,7 +190,7 @@ class GalleryStorageExtras /* the other half of GalleryStorage */ {
+ 			$value = $this->_gs->_normalizeValue($row[$i], $memberData[$i], true);
+ 
+ 			/* Store the value in the object */
+-			$entity->$callbacks[$i] = $value;
++			$entity->{$callbacks[$i]} = $value;
+ 			$entity->_persistentStatus['originalValue'][$callbacks[$i]] = $value;
+ 		    }
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901192032.x0JKW0Dp068660>