From c060fc6a1201399e6cee8238f490fc189ba8ffb9 Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Fri, 16 Jan 2009 07:14:39 +0000
Subject: [PATCH] blog / tags: MDL-17900 Use the new tags field type to tag
 users' interests.

---
 user/edit.php         |  2 +-
 user/editadvanced.php |  4 ++--
 user/editlib.php      | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/user/edit.php b/user/edit.php
index 15172d3d2a..0caeb37395 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -43,7 +43,7 @@
     // User interests separated by commas
     if (!empty($CFG->usetags)) {
         require_once($CFG->dirroot.'/tag/lib.php');
-        $user->interests = tag_get_tags_csv('user', $user->id, TAG_RETURN_TEXT);
+        $user->interests = tag_get_tags_array('user', $id);
     }
 
     // remote users cannot be edited
diff --git a/user/editadvanced.php b/user/editadvanced.php
index 6c4af31374..6236facd73 100644
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -67,10 +67,10 @@
     //Load custom profile fields data
     profile_load_data($user);
 
-    //user interests separated by commas
+    //User interests
     if (!empty($CFG->usetags)) {
         require_once($CFG->dirroot.'/tag/lib.php');
-        $user->interests = tag_get_tags_csv('user', $id, TAG_RETURN_TEXT); // formslib uses htmlentities itself
+        $user->interests = tag_get_tags_array('user', $id);
     }
 
     //create form
diff --git a/user/editlib.php b/user/editlib.php
index c9c1a596fc..aaa4a70936 100644
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -70,8 +70,8 @@ function useredit_update_trackforums($user, $usernew) {
     }
 }
 
-function useredit_update_interests($user, $csv_tag_names) {
-    tag_set('user', $user->id, explode(',', $csv_tag_names));
+function useredit_update_interests($user, $interests) {
+    tag_set('user', $user->id, $interests);
 }
 
 function useredit_shared_definition(&$mform) {
@@ -248,11 +248,10 @@ function useredit_shared_definition(&$mform) {
 
     }
 
-    if ( !empty($CFG->usetags) && has_capability('moodle/tag:create', get_context_instance(CONTEXT_SYSTEM)) ) {
+    if (!empty($CFG->usetags)) {
         $mform->addElement('header', 'moodle_interests', get_string('interests'));
-        $mform->addElement('textarea', 'interests', get_string('interestslist'), 'cols="45" rows="3"');
-        $mform->setHelpButton('interests', array('interestslist', get_string('helpinterestslist'),
-                          false, true, false));
+        $mform->addElement('tags', 'interests', get_string('interestslist'), array('display' => 'noofficial'));
+        $mform->setHelpButton('interests', array('interestslist', get_string('helpinterestslist'), false, true, false));
     }
 
     /// Moodle optional fields
-- 
2.39.5