Smileys now work in all Wiki texts

diff --git a/lib/weblib.php b/lib/weblib.php
index 068356ef69108e5a7068c7d66f7e9f4b9223a5a5..e29612b51257e245c2a2cf914778d02e14958d23 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -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;

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