L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Library parsing code into text_to_html

Browse Source
This commit is contained in:
moodler
2003-08-27 06:08:34 +00:00
parent 9609679b76
commit 27326a3eb6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+10 -6
View File
@@ -485,12 +485,6 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL) {
if (!isset($options->para)) {
$options->para=true;
}
if (!empty($CFG->librarypath)) {
if (file_exists("$CFG->dirroot/$CFG->librarypath/librarylib.php")) {
include_once("$CFG->dirroot/$CFG->librarypath/librarylib.php");
$text = librarytexttohtml($text);
}
}
return text_to_html($text, $options->smiley, $options->para);
break;
}
@@ -597,6 +591,8 @@ function text_to_html($text, $smiley=true, $para=true) {
/// Given plain text, makes it into HTML as nicely as possible.
/// May contain HTML tags already
global $CFG;
/// Remove any whitespace that may be between HTML tags
$text = eregi_replace(">([[:space:]]+)<", "><", $text);
@@ -609,6 +605,14 @@ function text_to_html($text, $smiley=true, $para=true) {
/// Make returns into HTML newlines.
$text = nl2br($text);
/// Insert links to library pages if Library is being used
if (!empty($CFG->librarypath)) {
if (file_exists("$CFG->dirroot/$CFG->librarypath/librarylib.php")) {
include_once("$CFG->dirroot/$CFG->librarypath/librarylib.php");
$text = librarytexttohtml($text);
}
}
/// Turn smileys into images.
if ($smiley) {
replace_smilies($text);