Added patch to fix generation of thumbnail URIs in templates.

diff --git a/debian/patches/102_fix-uris.diff b/debian/patches/102_fix-uris.diff
new file mode 100644 (file)
index 0000000..8e79469
--- /dev/null
+++ b/debian/patches/102_fix-uris.diff
@@ -0,0 +1,88 @@
+--- trunk.orig/templates/album/list
++++ trunk/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 |html%]"></a><br/>
+         <span class="info">
+             [%album.photos.size %] 
+         photo[%-"s" IF album.photos.size != 1 %]
+--- trunk.orig/templates/custom/list
++++ trunk/templates/custom/list
+@@ -8,7 +8,7 @@
+     [% FOR object = minilist %]
+         <td>
+         <a href="[%base%]/object/view/[%object.id%]">[% object %]<br/>
+-        <img src="[% object.photos.last.thumb_url |uri%]"></a><br/>
++        <img src="[% object.photos.last.thumb_url |html%]"></a><br/>
+         <span class="info">
+             [%object.photos.size %] 
+         photo[%-"s" IF object.photos.size != 1 %]</span>
+--- trunk.orig/templates/macros
++++ trunk/templates/macros
+@@ -2,7 +2,7 @@
+ <table class="thumb">
+     <tr><td>
+         <a href="[%base%]/photo/view/[%photo.id%]">
+-        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
++        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
+         </a>
+         </td> </tr>
+     <tr><td> 
+--- trunk.orig/templates/nav
++++ trunk/templates/nav
+@@ -4,7 +4,7 @@
+ </td><td align="right">
+ [% FOR photo = request.recent_uploads %]
+         <a href="[%base%]/photo/view/[%photo.id%]">
+-        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
++        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
+         </a>
+ [% END %]
+ </td></tr></table>
+--- trunk.orig/templates/recent.rss
++++ trunk/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 |html%]" alt="[%photo.title|html%]"/>
+         </a>
+ [% END %]
+         </description>
+--- trunk.orig/templates/systemtag/list
++++ trunk/templates/systemtag/list
+@@ -14,7 +14,7 @@
+         [% IF photos.last %]
+         <tr><td>
+         <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
+-            <img src="[% photos.last.thumb_url |uri%]">
++            <img src="[% photos.last.thumb_url |html%]">
+         </a>
+         </td></tr>
+         <tr><td class="info">
+--- trunk.orig/templates/tag/list
++++ trunk/templates/tag/list
+@@ -14,7 +14,7 @@
+         [% IF photos.last %]
+         <tr><td>
+         <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
+-            <img src="[% photos.last.thumb_url |uri%]">
++            <img src="[% photos.last.thumb_url |html%]">
+         </a>
+         </td></tr>
+         <tr><td class="info">
+--- trunk.orig/templates/user/list
++++ trunk/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 |html%]"></a><br/>
+         <span class="info">
+             [%photos.size %] 
+         photo[%-"s" IF photos.size != 1 %]</span>

diff --git a/debian/patches/series b/debian/patches/series
index df3b4aa5ebe0e5cebdf850a4a735c05e0ed0bcad..30a4a702d8530371f03c40a7332110f346d84a37 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 101_remove-ancc-refs.diff
+102_fix-uris.diff
 201_use-debian-paths.diff