From 5e991e3797b8cc81f45213ebd505a3803a372a11 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Sun, 17 Jan 2010 16:09:15 +0000
Subject: [PATCH] MDL-21362 fixed incorrect url constructors

---
 files/index.php           | 8 ++++----
 lib/file/file_browser.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/index.php b/files/index.php
index d2d9465fc41..40316b31b29 100644
--- a/files/index.php
+++ b/files/index.php
@@ -81,7 +81,7 @@ $file_info = $browser->get_file_info($context, $filearea, $itemid, $filepath, $f
 /// 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 ($file_info and $file_info->is_directory() and $file_info->is_writable() and
     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 and $delete) {
         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 487fec7f7af..5173ac38d65 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) {