diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 22e6003bb8..c6c28d4761 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -1194,8 +1194,7 @@ function delete_announcement_attachment_file($id) {
global $_course;
$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
$id=Database::escape_string($id);
- $sql="DELETE FROM $tbl_announcement_attachment WHERE id = $id";
- error_log($sql);
+ $sql="DELETE FROM $tbl_announcement_attachment WHERE id = $id";
$result=Database::query($sql, __FILE__,__LINE__);
// update item_property
//api_item_property_update($_course, 'announcement_attachment', $id,'AnnouncementAttachmentDeleted', api_get_user_id());
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 084f358144..c4f576218a 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -1487,30 +1487,46 @@ if ($display_announcement_list && !$surveyid) {
// show attachment list
$attachment_list = array();
- $attachment_list = get_attachment($myrow['id']);
+ $attachment_list = get_attachment($myrow['id']);
if (count($attachment_list)>0) {
- $realname=$attachment_list['path'];
- $user_filename=$attachment_list['filename'];
- $full_file_name = 'download.php?file='.$realname;
- echo '
';
- echo '
';
- echo Display::return_icon('attachment.gif',get_lang('Attachment'));
- echo ' '.$user_filename.' ';
- echo ''.$attachment_list['comment'].'';
-
- if (api_is_allowed_to_edit()) {
- echo ' '.Display::return_icon('delete.gif',get_lang('Delete')).'
';
- }
-
- }
+ $realname=$attachment_list['path'];
+ $user_filename=$attachment_list['filename'];
+ $full_file_name = 'download.php?file='.$realname;
+ echo '
';
+ echo '
';
+ echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+ echo ' '.$user_filename.' ';
+ echo ''.$attachment_list['comment'].'';
+
+ if (api_is_allowed_to_edit()) {
+ echo ' '.Display::return_icon('delete.gif',get_lang('Delete')).'
';
+ }
+ }
echo "\n\n";
$iterator ++;
- } // is_allowed_to_edit
+ } else { // end of is_allowed_to_edit
+ //students view
+ // show attachment list
+ $attachment_list = array();
+ $attachment_list = get_attachment($myrow['id']);
+
+ if (count($attachment_list)>0) {
+ $realname=$attachment_list['path'];
+ $user_filename=$attachment_list['filename'];
+ $full_file_name = 'download.php?file='.$realname;
+ echo '
';
+ echo '
';
+ echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+ echo ' '.$user_filename.' ';
+ echo ''.$attachment_list['comment'].'';
+ }
+ }
echo "