diff --git a/files/index.php b/files/index.php
index d2d9465fc4188..40316b31b2901 100644
--- a/files/index.php
+++ b/files/index.php
@@ -81,7 +81,7 @@
 /// process actions
 if ($file_info and $file_info->is_directory() and $file_info->is_writable() and $newdirname !== '' and data_submitted() and confirm_sesskey()) {
     if ($newdir_info = $file_info->create_directory($newdirname, $USER->id)) {
-        $params = $newdir_info->get_params_rawencoded();
+        $params = $newdir_info->get_params();
         redirect(new moodle_url('index.php', $params));
     } else {
         $error = "Could not create new dir"; // TODO: localise
@@ -94,7 +94,7 @@
     if (is_uploaded_file($_FILES['newfile']['tmp_name'])) {
         try {
             if ($newfile = $file_info->create_file_from_pathname($newfilename, $_FILES['newfile']['tmp_name'], $USER->id)) {
-                $params = $file_info->get_params_rawencoded();
+                $params = $file_info->get_params();
                 redirect(new moodle_url('index.php', $params));
 
             } else {
@@ -126,7 +126,7 @@
         if (!$file_info->delete()) {
             $error = "Could not delete file!"; // TODO: localise
         }
-        $params = $parent_info->get_params_rawencoded();
+        $params = $parent_info->get_params();
         redirect(new moodle_url('index.php', $params));
     }
 }
@@ -184,7 +184,7 @@ function html_header($context, $file_info){
 
     $strfiles = get_string("files");
     build_navbar_for_file($PAGE, $file_info);
-    $PAGE->set_url("/files/index.php", $file_info->get_params_rawencoded());
+    $PAGE->set_url("/files/index.php", $file_info->get_params());
     $PAGE->set_title("$SITE->shortname: $strfiles");
     echo $OUTPUT->header();
 
diff --git a/lib/file/file_browser.php b/lib/file/file_browser.php
index 487fec7f7af4d..5173ac38d6550 100644
--- a/lib/file/file_browser.php
+++ b/lib/file/file_browser.php
@@ -61,7 +61,7 @@ class file_browser {
      * @param int $itemid
      * @param string $filepath
      * @param string $filename
-     * @return object file_info object or null if not found or access not allowed
+     * @return file_info instance or null if not found or access not allowed
      */
     public function get_file_info($context, $filearea=null, $itemid=null, $filepath=null, $filename=null) {
         switch ($context->contextlevel) {