moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-52336-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
David Monllao 2015-12-10 17:38:15 +08:00
commit 0f86739482
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
View file

@ -212,7 +212,7 @@ class PclZip
// Note that no real action is taken, if the archive does not exist it is not // Note that no real action is taken, if the archive does not exist it is not
// created. Use create() for that. // created. Use create() for that.
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
public function PclZip($p_zipname) public function __construct($p_zipname)
{ {
// ----- Tests the zlib // ----- Tests the zlib

4
lib/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
View file

@ -393,9 +393,9 @@ class PHPExcel_Worksheet_AutoFilter_Column
// The columns array of PHPExcel_Worksheet_AutoFilter objects // The columns array of PHPExcel_Worksheet_AutoFilter objects
$this->$key = array(); $this->$key = array();
foreach ($value as $k => $v) { foreach ($value as $k => $v) {
$this->$key[$k] = clone $v; $this->{$key[$k]} = clone $v;
// attach the new cloned Rule to this new cloned Autofilter Cloned object // attach the new cloned Rule to this new cloned Autofilter Cloned object
$this->$key[$k]->setParent($this); $this->{$key[$k]}->setParent($this);
} }
} else { } else {
$this->$key = $value; $this->$key = $value;

1
lib/phpexcel/readme_moodle.txt
View file

@ -25,6 +25,7 @@ Changes:
- PHPExcel/Writer/Excel5/Worksheet.php - PHPExcel/Writer/Excel5/Worksheet.php
- PHPExcel/Writer/Excel5/Xf.php - PHPExcel/Writer/Excel5/Xf.php
lib/excellib.class.php has been updated so that only 2007 excel spreadsheets will be produced. lib/excellib.class.php has been updated so that only 2007 excel spreadsheets will be produced.
* MDL-52336 patch for PHP7 compatibility, after upgrade make sure that these changes are included and remove this line