Attachment 200698 Details for Bug 234557 – fix php syntax not valid in php 7.2

[patch] fix php syntax not valid in php 7.2

patch-gallery2-php72 (text/plain), 1.55 KB, created by mjl on 2019-01-02 09:25:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mjl

Created: 2019-01-02 09:25:35 UTC

Size: 1.55 KB

patch

obsolete

>diff -uNr gallery2/files/patch-GalleryStorageExtras.class gallery2-new/files/patch-GalleryStorageExtras.class
>--- gallery2/files/patch-GalleryStorageExtras.class	1970-01-01 12:00:00.000000000 +1200
>+++ gallery2-new/files/patch-GalleryStorageExtras.class	2019-01-02 21:50:01.196337000 +1300
>@@ -0,0 +1,11 @@
>+--- modules/core/classes/GalleryStorage/GalleryStorageExtras.class.orig	2019-01-02 21:47:02.407823000 +1300
>++++ modules/core/classes/GalleryStorage/GalleryStorageExtras.class	2019-01-02 21:47:42.661863000 +1300
>+@@ -190,7 +190,7 @@
>+ 			$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;
>+ 		    }
>+ 
>diff -uNr gallery2/files/patch-adodb-time.inc.php gallery2-new/files/patch-adodb-time.inc.php
>--- gallery2/files/patch-adodb-time.inc.php	1970-01-01 12:00:00.000000000 +1200
>+++ gallery2-new/files/patch-adodb-time.inc.php	2019-01-02 19:04:12.904151000 +1300
>@@ -0,0 +1,13 @@
>+--- lib/adodb/adodb-time.inc.php.orig	2019-01-02 19:01:34.393169000 +1300
>++++ lib/adodb/adodb-time.inc.php	2019-01-02 19:01:48.184449000 +1300
>+@@ -1004,9 +1004,7 @@
>+ 	$hrs = floor($zhrs);
>+ 	if ($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;
>++	return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
>+ }
>+ 
>+

Actions: View | Diff

Attachments on bug 234557: 200693 | 200698 | 213513