Commit 383039ad authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1898652: Only loop over zipping up export files if dir is not empty 



Change-Id: I488a8be73fb224ba0677d0e07bd193818cf198f5
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent d6781e3f

htdocs/export/lib.php

+8 −6
Original line number Diff line number Diff line
@@ -945,6 +945,7 @@ function create_zip_archive($exportdir, $filename, $files) { 
            if (count($files) == 0) {

                $archive->addEmptyDir($dir);

            }

            else {

                foreach($files as $file) {

                    if (is_file($exportdir . $dir . $file)) {

                        $archive->addFile($exportdir . $dir . $file, $dir . $file);
@@ -954,6 +955,7 @@ function create_zip_archive($exportdir, $filename, $files) { 
                    }

                }

            }

        }

        $archive->close();

    }

    else {