moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now gets it's courseid properly from the caller

Browse source
This commit is contained in:
thepurpleblob 2004-08-27 14:22:01 +00:00
parent dc1e6eef64
commit 546764d89c
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/wiki.php
View file

@ -54,6 +54,7 @@ class Wiki {
var $spelling_on; var $spelling_on;
var $list_backtrack; var $list_backtrack;
var $output; // output buffer var $output; // output buffer
var $courseid;
function close_block( $state ) { function close_block( $state ) {
// provide appropriate closure for block according to state // provide appropriate closure for block according to state
@ -270,23 +271,23 @@ class Wiki {
" <a href=\"".$CFG->wwwroot."/mod/\\1/view.php?id=\\2\">\\3</a> ", $line ); " <a href=\"".$CFG->wwwroot."/mod/\\1/view.php?id=\\2\">\\3</a> ", $line );
// Replace picture resource link // Replace picture resource link
global $course; // This is a bit risky - it won't work everywhere // global $course; // This is a bit risky - it won't work everywhere
if ($CFG->slasharguments) { if ($CFG->slasharguments) {
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)", $line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php/$course->id/\\1\\2\" alt=\"\\3\" />", $line ); "<img src=\"$CFG->wwwroot/file.php/$this->courseid/\\1\\2\" alt=\"\\3\" />", $line );
} else { } else {
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)", $line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\\2\" alt=\"\\3\" />", $line ); "<img src=\"$CFG->wwwroot/file.php\?file=$this->courseid/\\1\\2\" alt=\"\\3\" />", $line );
} }
// Replace everything else resource link // Replace everything else resource link
if ($CFG->slasharguments) { if ($CFG->slasharguments) {
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)", $line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"<a href=\"$CFG->wwwroot/file.php/$course->id/\\1\" >\\2</a>", $line ); "<a href=\"$CFG->wwwroot/file.php/$this->courseid/\\1\" >\\2</a>", $line );
} else { } else {
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)", $line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"<a href=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\" >\\2</a>", $line ); "<a href=\"$CFG->wwwroot/file.php\?file=$this->courseid/\\1\" >\\2</a>", $line );
} }
replace_smilies( $line ); replace_smilies( $line );
@ -327,7 +328,7 @@ class Wiki {
} }
function format( $content ) { function format( $content, $courseid ) {
// main entry point for processing TikiText // main entry point for processing TikiText
// $content is string containing text with Tiki formatting // $content is string containing text with Tiki formatting
// return: string containing XHTML formatting // return: string containing XHTML formatting
@ -339,6 +340,7 @@ class Wiki {
$this->list_depth = 0; $this->list_depth = 0;
$this->list_backtrack = array(); $this->list_backtrack = array();
$this->spelling_on = false; $this->spelling_on = false;
$this->courseid = $courseid;
// split content into array of single lines // split content into array of single lines
$lines = explode( "\n",$content ); $lines = explode( "\n",$content );