From 011438e74a11d3b1b820c077fa44907f389cd9af Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Apr 2015 12:56:56 -0400 Subject: [PATCH] Bug PHP 7 compatibility in bfShapeFiles Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/bfShapeFiles/ShapeFile.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22e8ba1fa0..63fb3110aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug Fix issues related to number of decimal places in time - bug #4853 Relation view between 1600 and 1780 px - bug PHP 7 compatibility in php-gettext +- bug PHP 7 compatibility in bfShapeFiles 4.4.2.0 (2015-04-13) - bug #4835 PMA_hideShowConnection not called after submit_num_fields diff --git a/libraries/bfShapeFiles/ShapeFile.lib.php b/libraries/bfShapeFiles/ShapeFile.lib.php index bf726a328c..795d0aa292 100644 --- a/libraries/bfShapeFiles/ShapeFile.lib.php +++ b/libraries/bfShapeFiles/ShapeFile.lib.php @@ -83,7 +83,7 @@ var $records; - function ShapeFile($shapeType, $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0), $FileName = NULL) { + public function __construct($shapeType, $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0), $FileName = NULL) { $this->shapeType = $shapeType; $this->boundingBox = $boundingBox; $this->FileName = $FileName; @@ -357,7 +357,7 @@ var $SHPData = array(); var $DBFData = array(); - function ShapeRecord($shapeType) { + public function __construct($shapeType) { $this->shapeType = $shapeType; }