Browse Source

Merge pull request #2213 from aragonc/1.11.x

1.11.x
Alex Aragon Calixto 7 years ago
parent
commit
fbec1ab3d1
2 changed files with 7 additions and 8 deletions
  1. 2 1
      main/dropbox/dropbox_functions.inc.php
  2. 5 7
      main/dropbox/index.php

+ 2 - 1
main/dropbox/dropbox_functions.inc.php

@@ -1129,8 +1129,9 @@ function format_feedback($feedback)
 
 /**
 * this function returns the code for the form for adding a new feedback message to a dropbox file.
+* @param $url  url string
 * @return string code
-*
+* 
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @version march 2006
 */

+ 5 - 7
main/dropbox/index.php

@@ -438,13 +438,11 @@ if ($action != 'add') {
                 // This is a hack to have an additional row in a sortable table
                 if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
                     $action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
-                    $action_icons .= '<tr>
-                        <td colspan="2">
-                            <a class = "btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".
-                            get_lang('CloseFeedback')."</a>
-                        </td>
-                        <td colspan=\"7\">".
-                        feedback($dropbox_file->feedback2).
+                    $url= api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params;
+                    $action_icons .= "        
+                        <tr>
+                        <td colspan=\"9\">".
+                        feedback($dropbox_file->feedback2, $url).
                         "</td></tr>";
                 }
                 if (api_get_session_id() == 0) {