From 969c409ba1dba2cdacc82d882761d894f6f6bf2e Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Fri, 2 Dec 2011 13:59:57 +0000 Subject: [PATCH] Bugfix: Work item 16266 - PHPExcel_Style::applyFromArray() returns null rather than style object in advanced mode git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@83539 2327b42d-5241-43d6-9e2a-de5ac946f064 --- Classes/PHPExcel/Style.php | 2 +- changelog.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Style.php b/Classes/PHPExcel/Style.php index 3b340363..a5802055 100644 --- a/Classes/PHPExcel/Style.php +++ b/Classes/PHPExcel/Style.php @@ -414,7 +414,7 @@ class PHPExcel_Style implements PHPExcel_IComparable $this->getActiveSheet()->getStyle($range)->applyFromArray($regionStyles, false); } } - return; + return $this; } // SIMPLE MODE: diff --git a/changelog.txt b/changelog.txt index e29418bc..9520bb13 100644 --- a/changelog.txt +++ b/changelog.txt @@ -43,6 +43,7 @@ Fixed in SVN: - Bugfix: (MBaker) Work item 16895 - PHP Invalid index notice on writing excel file when active sheet has been deleted - Bugfix: (MBaker) Work item 16956 - External links in Excel2010 files cause Fatal error - Bugfix: (MBaker) Work item 16960 - Previous calculation engine error conditions trigger cyclic reference errors +- Bugfix: (mkopinsky) Work item 16266 - PHPExcel_Style::applyFromArray() returns null rather than style object in advanced mode - General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC) - General: (MBaker) Work item 15461 - Locale file paths not fit for windows - General: (MBaker) Work item 16643 - Add file directory as a cache option for cache_to_discISAM