diff --git a/dataformat/csv/classes/writer.php b/dataformat/csv/classes/writer.php index 8ccea006a58e3..36b9eac858a54 100644 --- a/dataformat/csv/classes/writer.php +++ b/dataformat/csv/classes/writer.php @@ -24,8 +24,6 @@ namespace dataformat_csv; -require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php"); - defined('MOODLE_INTERNAL') || die(); /** diff --git a/dataformat/excel/classes/writer.php b/dataformat/excel/classes/writer.php index 0783e9e01c517..269e9b87a3427 100644 --- a/dataformat/excel/classes/writer.php +++ b/dataformat/excel/classes/writer.php @@ -24,8 +24,6 @@ namespace dataformat_excel; -require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php"); - defined('MOODLE_INTERNAL') || die(); /** diff --git a/dataformat/ods/classes/writer.php b/dataformat/ods/classes/writer.php index 8f2822871d069..9418abe652e0d 100644 --- a/dataformat/ods/classes/writer.php +++ b/dataformat/ods/classes/writer.php @@ -24,8 +24,6 @@ namespace dataformat_ods; -require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php"); - defined('MOODLE_INTERNAL') || die(); /** diff --git a/lib/classes/component.php b/lib/classes/component.php index aeccbe68e4b13..2f94e480e7315 100644 --- a/lib/classes/component.php +++ b/lib/classes/component.php @@ -77,7 +77,8 @@ class core_component { 'GeoIp2' => 'lib/maxmind/GeoIp2', 'Sabberworm\\CSS' => 'lib/php-css-parser', 'MoodleHQ\\RTLCSS' => 'lib/rtlcss', - 'Leafo\\ScssPhp' => 'lib/scssphp' + 'Leafo\\ScssPhp' => 'lib/scssphp', + 'Box\\Spout' => 'lib/spout/src/Spout' ); /** diff --git a/lib/spout/readme_moodle.txt b/lib/spout/readme_moodle.txt index 0df51eb7cabcd..350f79c68217d 100644 --- a/lib/spout/readme_moodle.txt +++ b/lib/spout/readme_moodle.txt @@ -1,13 +1,10 @@ -#!/bin/sh -# -# Description of import of Horde libraries -# - -wget https://codeload.github.com/box/spout/zip/v2.4.3 -unzip v2.4.3 -rm v2.4.3 -rm spout-2.4.3/composer.json -rm -rf src -mv -f spout-2.4.3/* . -rm -r spout-2.4.3/ +Description of Spout library import 2.6.0 +========================================= +* Download / Clone from https://github.com/box/spout/ +* Only include the src/Spout directory. +* Update lib/thirdpartylibs.xml with the latest version. +2016/09/20 +---------- +Updated to v2.6.0 (MDL-56012) +by Adrian Greeve \ No newline at end of file diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml index 8acc232fc55c0..6e38fd2259a53 100644 --- a/lib/thirdpartylibs.xml +++ b/lib/thirdpartylibs.xml @@ -262,8 +262,9 @@ spout Spout - GPL - 2.3.0 + Apache + 2.6.0 + 2.0 amd/src/chartjs-lazy.js