Smileys now work in all Wiki texts

This commit is contained in:
moodler 2003-05-29 15:39:51 +00:00
parent 423b77166d
commit 7f9bd7b9c3
2 changed files with 13 additions and 15 deletions

View File

@ -462,12 +462,9 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL) {
break;
case FORMAT_WIKI:
$text = wiki_to_html($text);
replace_smilies($text);
return $text;
return wiki_to_html($text);
break;
default: // FORMAT_MOODLE or anything else
if (!isset($options->smiley)) {
$options->smiley=true;

View File

@ -249,24 +249,25 @@ class Wiki {
// acronym handing, example HTML(Hypertext Markyp Language)
$line = ereg_replace( "([A-Z]+)\(([^)]+)\)", "<acronym title=\"\\2\">\\1</acronym>", $line );
// *Moodle Specific* replace resource link >>##(Description Text)
// *Moodle Specific*
if (IN_MOODLE==1) {
// Replace resource link >>##(Description Text)
$line = eregi_replace( " ([a-zA-Z]+):([0-9]+)\(([^)]+)\)",
" <a href=\"".$CFG->wwwroot."/mod/\\1/view.php?id=\\2\">\\3</a> ", $line );
}
// *Moodle specific* replace picture resource link
if (IN_MOODLE==1) {
global $course;
// Replace picture resource link
global $course; // This is a bit risky - it won't work everywhere
if ($CFG->slasharguments) {
$line = eregi_replace( "/([a-zA-Z./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php/$course->id/\\1\\2\" alt=\"\\3\" />", $line );
}
else {
$line = eregi_replace( "/([a-zA-Z./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\\2\" alt=\"\\3\" />", $line );
$line = eregi_replace( "/([a-zA-Z./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php/$course->id/\\1\\2\" alt=\"\\3\" />", $line );
} else {
$line = eregi_replace( "/([a-zA-Z./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\\2\" alt=\"\\3\" />", $line );
}
replace_smilies( $line );
}
return $line;