mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 07:25:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48901_master' of git://github.com/dmonllao/moodle

Browse Source 
Conflicts:
	mod/lesson/upgrade.txt
This commit is contained in:
Dan Poltawski 2015-02-03 23:27:15 +00:00
commit 40582c75e0
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod/lesson/reformat.php
View File

@ -25,6 +25,16 @@
defined('MOODLE_INTERNAL') || die();
debugging('This file functions are deprecated, please do not use this functions any more.', DEBUG_DEVELOPER);
/**
* Removes double CRs.
*
* @deprecated Since Moodle 2.9 MDL-48901 - please do not use this function any more.
* @todo MDL-48985 This will be deleted in Moodle 3.1
* @param string $filename
* @return void
*/
function removedoublecr($filename) {
// This function will adjust a file in roughly Aiken style by replacing extra newlines with <br/> tags
// so that instructors can have newlines wherever they like as long as the overall format is in Aiken
@ -82,7 +92,14 @@ function removedoublecr($filename) {
}
}
// jjg7:8/9/2004
/**
* This function converts from Brusca style to Aiken.
*
* @deprecated Since Moodle 2.9 MDL-48901 - please do not use this function any more.
* @todo MDL-48985 This will be deleted in Moodle 3.1
* @param string $filename
* @return bool Success.
*/
function importmodifiedaikenstyle($filename) {
// This function converts from Brusca style to Aiken
$lines = file($filename);
@ -202,4 +219,3 @@ function importmodifiedaikenstyle($filename) {
return false;
}
}

1
mod/lesson/upgrade.txt
View File

@ -11,6 +11,7 @@ This files describes API changes in the lesson code.
* A fourth parameter (format) has been added to the add_answer() function
located as part of the lesson_add_page_form_base class. If specified with a value of 'LESSON_ANSWER_HTML'
then a rich html editor is generated. Otherwise an editor is created with Moodle Auto Format
* removedoublecr() and importmodifiedaikenstyle() are now deprecated.
=== Earlier changes ===