diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index c4434895e4..601f1f4347 100644 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -1342,12 +1342,13 @@ class Blog echo "", "",get_lang('Member'),"\n", "",get_lang('Task'),"\n", + "",get_lang('Description'),"\n", "",get_lang('TargetDate'),"\n", "",get_lang('Modify'),"\n", "\n"; - $sql = "SELECT task_rel_user.*, task.title, user.firstname, user.lastname FROM $tbl_blogs_tasks_rel_user task_rel_user + $sql = "SELECT task_rel_user.*, task.title, user.firstname, user.lastname, task.description FROM $tbl_blogs_tasks_rel_user task_rel_user INNER JOIN $tbl_blogs_tasks task ON task_rel_user.task_id = task.task_id INNER JOIN $tbl_users user ON task_rel_user.user_id = user.user_id WHERE task_rel_user.blog_id = '".(int)$blog_id."' ORDER BY `target_date` ASC"; @@ -1366,6 +1367,7 @@ class Blog echo '', '' . $assignment['firstname'] . ' ' . $assignment['lastname'] . '', ''.stripslashes($assignment['title']) . '', + ''.stripslashes($assignment['description']) . '', '' . $assignment['target_date'] . '', '', '', @@ -1926,7 +1928,7 @@ class Blog $tbl_users = Database::get_main_table(TABLE_MAIN_USER); $sql = " - SELECT title + SELECT title, description FROM $tbl_blogs_tasks WHERE task_id = '".(int)$task_id."'"; $result = api_sql_query($sql, __FILE__, __LINE__); @@ -1945,7 +1947,9 @@ class Blog $result = api_sql_query($sql, __FILE__, __LINE__); // Display - echo '' . get_lang('SelectTaskArticle') . ' "' . $row['title'] . '"'; + echo '' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"'; + echo ''.stripslashes($row['description']) . '

'; + if(mysql_num_rows($result) > 0) { @@ -2169,7 +2173,7 @@ class Blog while($r = mysql_fetch_array($sql_res)) { - $task .= $r['task'] . ', '; + $task .= stripslashes($r['task']) . ', '; } echo $task;