Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle
- Loading branch information
Showing
with
698 additions
and 285 deletions.
- +94 −1 files/classes/privacy/provider.php
- +1 −0 lang/en/files.php
- +25 −14 lib/filelib.php
- +5 −2 lib/moodlelib.php
- +7 −1 lib/outputcomponents.php
- +1 −0 lib/outputrenderers.php
- +73 −0 lib/tests/filelib_test.php
- +347 −0 lib/tests/moodle_url_test.php
- +0 −232 lib/tests/weblib_test.php
- +8 −0 lib/upgrade.txt
- +42 −11 lib/weblib.php
- +9 −2 mod/forum/classes/output/email/renderer.php
- +11 −3 mod/forum/classes/output/emaildigestbasic/renderer_textemail.php
- +11 −3 mod/forum/classes/output/emaildigestfull/renderer_textemail.php
- +13 −13 mod/forum/classes/output/forum_post.php
- +1 −1 mod/forum/tests/mail_test.php
- +6 −2 pluginfile.php
- +44 −0 tokenpluginfile.php
Oops, something went wrong.