From 9dc6c294195c483328b38b52c6788a3031ef1867 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Wed, 31 Mar 2010 11:49:54 -0500
Subject: [PATCH] fixed: Viewing a Gallery File with non-ASCII keywords crashes

---
 docs/changelog/7.x.x.txt             | 1 +
 lib/WebGUI/Asset/File/GalleryFile.pm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ff077f3e7..222a52178 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -7,6 +7,7 @@
  - fixed #11492: photo details
  - fixed #11503: Gallery: Wrong owner after uploading of ZIP archives
  - fixed #11494: Error message on mysql down
+ - fixed: Viewing a Gallery File with non-ASCII keywords crashes
 
 7.9.1
  - fixed #11464: blank page after setting posts per page in Collaboration System to 0 (zero)
diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm
index d718d8a11..0c1abe0f0 100644
--- a/lib/WebGUI/Asset/File/GalleryFile.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile.pm
@@ -901,13 +901,13 @@ sub view {
             keyword             => $keyword,
             url_searchKeyword   
                 => $self->getGallery->getUrl(
-                    "func=search;submit=1;keywords=" . uri_escape($keyword) 
+                    "func=search;submit=1;keywords=" . uri_escape_utf8($keyword) 
                 ),
             url_searchKeywordUser
                 => $self->getGallery->getUrl(
                     "func=search;submit=1;"
                     . "userId=" . $self->get("ownerUserId") . ';'
-                    . 'keywords=' . uri_escape( $keyword ) 
+                    . 'keywords=' . uri_escape_utf8( $keyword ) 
                 ),
         };
     }