Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 02:49:11 +0000 (10:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 02:49:11 +0000 (10:49 +0800)
Conflicts:
lib/upgrade.txt

1  2 
backup/moodle2/backup_stepslib.php
lang/en/admin.php
lang/en/error.php
lib/filestorage/stored_file.php
lib/moodlelib.php
lib/upgrade.txt

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/upgrade.txt
@@@ -41,7 -41,11 +41,12 @@@ information provided here is intended e
  * Each plugin should include version information in version.php.
  * Module and block tables do not contain version column any more, use get_config('xx_yy', 'version') instead.
  * $USER->password field is intentionally unset so that session data does not contain password hashes.
 +* Use core_shutdown_manager::register_function() instead of register_shutdown_function().
+ * New file packer for .tar.gz files; obtain by calling get_file_packer('application/x-gzip'). Intended initially
+   for use in backup/restore only, as there are limitations on supported filenames. Also new packer for
+   backups which supports both compression formats; get_file_packer('application/vnd.moodle.backup').
+ * New optional parameter to stored_file::get_content_file_handle to open file handle with 'gzopen' instead
+   of 'fopen' to read gzip-compressed files if required.
  
  DEPRECATIONS:
  Various previously deprecated functions have now been altered to throw DEBUG_DEVELOPER debugging notices