From: moodler <moodler>
Date: Mon, 16 Apr 2007 06:22:17 +0000 (+0000)
Subject: Merged change to format_text from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3212d2f2401aa2ca64f39b847f7cd333d735c5f0;p=moodle.git

Merged change to format_text from stable
---

diff --git a/user/profile/lib.php b/user/profile/lib.php
index 21f50c90cf..6b9a19acc3 100644
--- a/user/profile/lib.php
+++ b/user/profile/lib.php
@@ -53,7 +53,8 @@ class profile_field_base {
      * Display the data for this field
      */
     function display_data() {
-        return s(format_string($this->data));
+        $options->para = false;
+        return format_text($this->data, FORMAT_MOODLE, $options);
     }
     
     /**