Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 5 insertions, 1 deletions

diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
index dd04b25f..0c07ea5e 100644
--- a/modules/gallery/libraries/MY_Kohana_Exception.php
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -23,7 +23,7 @@ class Kohana_Exception extends Kohana_Exception_Core {
    */
   public static function text($e) {
     if ($e instanceof Kohana_404_Exception) {
-      return "File not found: " . Router::$complete_uri;
+      return "File not found: " . rawurlencode(Router::$complete_uri);
     } else {
       return sprintf(
         "%s [ %s ]: %s\n%s [ %s ]\n%s",
@@ -94,4 +94,8 @@ class Kohana_Exception extends Kohana_Exception_Core {
     }
     return $result;
   }
+
+  public static function debug_path($file) {
+    return html::clean(parent::debug_path($file));
+  }
 }
\ No newline at end of file