Merged change to format_text from stable

diff --git a/user/profile/lib.php b/user/profile/lib.php
index 21f50c90cfd1454f1cce2af7c45931dfe5565a29..6b9a19acc3639e5b8f2abed5ce9b2e5736838991 100644 (file)
--- 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);
     }
     
     /**