Permalink
Browse files

AC_4897, AC_4898, AC_4899: Multifile uploader fixes.

Removed an extra letter "u" on the page.  Now properly forwards user back to the popup upload page upon successful file upload.  Also fixed a vsprinf issue with the Messenger.
  • Loading branch information...
Harris Wong
Harris Wong committed Oct 14, 2011
1 parent 5cc4ff1 commit 3f02efd3b4c06dfe9836b53927c77afc164df8c7
Showing with 4 additions and 3 deletions.
  1. +2 −2 docs/file_manager/filemanager_display.inc.php
  2. +2 −1 docs/file_manager/upload.php
@@ -204,7 +204,7 @@ function fm_path(){
<th class="fl-uploader-file-name">File Name</th>
<th class="fl-uploader-file-size">Size</th>
<th class="fl-uploader-file-actions"></th>
- </tr>u
+ </tr>
</table>
<!-- File Queue body, which is the default container for the FileQueueView component -->
@@ -326,7 +326,7 @@ function fm_path(){
jQuery('#uploader-error-container').html("");
},
afterUploadComplete: function () {
- window.location = "<?php echo TR_BASE_HREF; ?>file_manager/index.php?pathext=<?php echo $pathext . SEP . '_course_id=' . $_course_id; ?>";
+ window.location = "<?php echo TR_BASE_HREF . 'file_manager/index.php?popup='.$popup.SEP. 'framed='.$framed.SEP.'cp='.$_GET['cp'].SEP.'pid='.$_GET['pid'].SEP.'cid='.$cid.SEP.'a_type='.$a_type.SEP.'_course_id='.$_course_id; ?>"
}
},
components: {
@@ -96,7 +96,8 @@
$_FILES['uploadedfile']['name'] = substr(time(), -4).'.'.$_FILES['uploadedfile']['name'];
$f = array('FILE_EXISTS',
- substr($_FILES['uploadedfile']['name'], 5));
+ substr($_FILES['uploadedfile']['name'], 5),
+ $_FILES['uploadedfile']['name']);
$msg->addFeedback($f);
}

0 comments on commit 3f02efd

Please sign in to comment.