gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Marc Delisle 2015-04-15 14:57:13 -04:00
commit 7df3cb4552
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -33,6 +33,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

4
libraries/bfShapeFiles/ShapeFile.lib.php
View File

@ -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;
}