Merge branch 'MDL-52336-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:38:15 +0000 (17:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:38:15 +0000 (17:38 +0800)
lib/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
lib/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
lib/phpexcel/readme_moodle.txt

index 263137d..a5a9b0a 100644 (file)
@@ -212,7 +212,7 @@ class PclZip
     //     Note that no real action is taken, if the archive does not exist it is not
     //     created. Use create() for that.
     // --------------------------------------------------------------------------------
-    public function PclZip($p_zipname)
+    public function __construct($p_zipname)
     {
 
         // ----- Tests the zlib
index d64fd81..e0769c4 100644 (file)
@@ -393,9 +393,9 @@ class PHPExcel_Worksheet_AutoFilter_Column
                 //    The columns array of PHPExcel_Worksheet_AutoFilter objects
                 $this->$key = array();
                 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
-                    $this->$key[$k]->setParent($this);
+                    $this->{$key[$k]}->setParent($this);
                 }
             } else {
                 $this->$key = $value;
index c3b5fd6..1a428cc 100644 (file)
@@ -25,6 +25,7 @@ Changes:
    - PHPExcel/Writer/Excel5/Worksheet.php
    - PHPExcel/Writer/Excel5/Xf.php
    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