From b53b2ee6e69e2a766ee123333342feee602752db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borko=20Rastovi=C4=87?= Date: Fri, 12 May 2017 12:46:59 +0200 Subject: [PATCH 1/3] Update excel_reader2.php --- php-excel-reader/excel_reader2.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-excel-reader/excel_reader2.php b/php-excel-reader/excel_reader2.php index 75351b7..3be7650 100644 --- a/php-excel-reader/excel_reader2.php +++ b/php-excel-reader/excel_reader2.php @@ -94,7 +94,7 @@ function v($data,$pos) { class OLERead { var $data = ''; - function OLERead(){ } + function __construct(){ } function read($sFileName){ // check if file exist and is readable (Darko Miljanovic) @@ -1734,4 +1734,4 @@ function _GetInt4d($data, $pos) { } -?> \ No newline at end of file +?> From 35addb89fb77484e217cf03f44c86a002f94bfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borko=20Rastovi=C4=87?= Date: Fri, 12 May 2017 12:52:00 +0200 Subject: [PATCH 2/3] Removed closing PHP tag --- php-excel-reader/excel_reader2.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/php-excel-reader/excel_reader2.php b/php-excel-reader/excel_reader2.php index 3be7650..5067fbe 100644 --- a/php-excel-reader/excel_reader2.php +++ b/php-excel-reader/excel_reader2.php @@ -1733,5 +1733,3 @@ function _GetInt4d($data, $pos) { } } - -?> From 9cea3cf06d0744b443e11d35d2cb34851c3c0474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borko=20Rastovi=C4=87?= Date: Fri, 12 May 2017 12:53:28 +0200 Subject: [PATCH 3/3] Fix deprecated same name construct error --- php-excel-reader/excel_reader2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-excel-reader/excel_reader2.php b/php-excel-reader/excel_reader2.php index 5067fbe..2e0709b 100644 --- a/php-excel-reader/excel_reader2.php +++ b/php-excel-reader/excel_reader2.php @@ -912,7 +912,7 @@ function _format_value($format,$num,$f) { * * Some basic initialisation */ - function Spreadsheet_Excel_Reader($file='',$store_extended_info=true,$outputEncoding='') { + function __construct($file='',$store_extended_info=true,$outputEncoding='') { $this->_ole = new OLERead(); $this->setUTFEncoder('iconv'); if ($outputEncoding != '') {