From f47e6702b33e9e1e6d1ef00a690ef37edb8bbb2d Mon Sep 17 00:00:00 2001
From: Simon Cozens <simon@simon-cozens.org>
Date: Sat, 24 Mar 2007 16:08:50 +0000
Subject: [PATCH] More URI antiescaping; fixes #22.

git-svn-id: http://svn.simon-cozens.org/memories/trunk@51 041978f6-d955-411f-a9d7-1d8545c9c3c7
---
 templates/album/list     | 2 +-
 templates/custom/list    | 2 +-
 templates/photo/similar  | 2 +-
 templates/recent.rss     | 2 +-
 templates/systemtag/list | 6 +++---
 templates/tag/list       | 6 +++---
 templates/user/list      | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/album/list b/templates/album/list
index 0229289..9c28955 100644
--- a/templates/album/list
+++ b/templates/album/list
@@ -8,7 +8,7 @@
     [% FOR album = minilist %]
         <td>
         <a href="[%base%]/album/view/[%album.id%]">[% album %]<br/>
-        <img src="[% album.photos.last.thumb_url |uri%]"></a><br/>
+        <img src="[% album.photos.last.thumb_url %]"></a><br/>
         <span class="info">
             [%album.photos.size %] 
         photo[%-"s" IF album.photos.size != 1 %]
diff --git a/templates/custom/list b/templates/custom/list
index a0aaa51..2c66aa8 100644
--- a/templates/custom/list
+++ b/templates/custom/list
@@ -8,7 +8,7 @@
     [% FOR object = minilist %]
         <td>
         <a href="[%base%]/[%object.moniker%]/view/[%object.id%]">[% object %]<br/>
-        <img src="[% object.photos.last.thumb_url |uri%]"></a><br/>
+        <img src="[% object.photos.last.thumb_url %]"></a><br/>
         <span class="info">
             [%object.photos.size %] 
         photo[%-"s" IF object.photos.size != 1 %]</span>
diff --git a/templates/photo/similar b/templates/photo/similar
index 2743353..1c8b76d 100644
--- a/templates/photo/similar
+++ b/templates/photo/similar
@@ -4,6 +4,6 @@
 
 <p>
 Suggested tags: [% FOR tag = photo.recommended_tags; %]
-<a href="[%base%]/tag/view/[%tag.name|uri%]">[%tag.name%] </a>
+<a href="[%base%]/tag/view/[%tag.name%]">[%tag.name%] </a>
 [% END %]
 </p>
diff --git a/templates/recent.rss b/templates/recent.rss
index 311187c..7e146fe 100644
--- a/templates/recent.rss
+++ b/templates/recent.rss
@@ -12,7 +12,7 @@
         <description>
 [% FILTER html %]
         <a href="[%base%]/photo/view/[%photo.id%]">
-        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+        <img src="[% photo.thumb_url %]" alt="[%photo.title|html%]"/>
         </a>
 [% END %]
         </description>
diff --git a/templates/systemtag/list b/templates/systemtag/list
index 9a7361a..cc9d344 100644
--- a/templates/systemtag/list
+++ b/templates/systemtag/list
@@ -8,13 +8,13 @@
     [% FOR tag = minilist %]
         <td>
         <table><tr> <td width="100%" class="taglistheader">
-        <a href="[%base%]/tag/view/[%tag.name |html|uri%]">[% tag %]</a>
+        <a href="[%base%]/tag/view/[%tag.name |html%]">[% tag %]</a>
         </td></tr>
         [% SET photos = tag.photos %]
         [% IF photos.last %]
         <tr><td>
-        <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
-            <img src="[% photos.last.thumb_url |uri%]">
+        <a href="[%base%]/tag/view/[%tag.name |html%]">
+            <img src="[% photos.last.thumb_url %]">
         </a>
         </td></tr>
         <tr><td class="info">
diff --git a/templates/tag/list b/templates/tag/list
index 9a7361a..1a9706f 100644
--- a/templates/tag/list
+++ b/templates/tag/list
@@ -8,13 +8,13 @@
     [% FOR tag = minilist %]
         <td>
         <table><tr> <td width="100%" class="taglistheader">
-        <a href="[%base%]/tag/view/[%tag.name |html|uri%]">[% tag %]</a>
+        <a href="[%base%]/tag/view/[%tag.name |html%]">[% tag %]</a>
         </td></tr>
         [% SET photos = tag.photos %]
         [% IF photos.last %]
         <tr><td>
-        <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
-            <img src="[% photos.last.thumb_url |uri%]">
+        <a href="[%base%]/tag/view/[%tag.name |html%]">
+            <img src="[% photos.last.thumb_url%]">
         </a>
         </td></tr>
         <tr><td class="info">
diff --git a/templates/user/list b/templates/user/list
index 66ba34e..078c83f 100644
--- a/templates/user/list
+++ b/templates/user/list
@@ -10,7 +10,7 @@
         [% SET photos = user.photos %]
         <a href="[%base%]/user/view/[%user.id%]">[% user %]<br/>
         [% IF photos.last %]
-        <img src="[% photos.last.thumb_url |uri%]"></a><br/>
+        <img src="[% photos.last.thumb_url %]"></a><br/>
         <span class="info">
             [%photos.size %] 
         photo[%-"s" IF photos.size != 1 %]</span>
-- 
2.39.5