Backport

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1211 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 5bf48a8..920450c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ From 0.9.12 branch:
     * Search:
         - #566: Fix accent detection                                       -FRU
 
+    * Xnet:
+        - #574: Fix subscription link customization                        -FRU
+
 ================================================================================
 VERSION 0.9.12                                                        25 11 2006
 

diff --git a/htdocs/images/icons/resultset_next.gif b/htdocs/images/icons/resultset_next.gif
new file mode 100644 (file)
index 0000000..b71a4f7
Binary files /dev/null and b/htdocs/images/icons/resultset_next.gif differ

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index ac9f43a..187000d 100644 (file)
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -65,7 +65,7 @@
       M'inscrire :
     </td>
     <td>
-      <a href="{$platal->ns}subscribe">m'inscrire</a>
+      <a href="{if $asso.sub_url}{$asso.sub_url}{else}{$platal->ns}subscribe{/if}">m'inscrire</a>
     </td>
   </tr>
   {/if}