From cbdc323db7013347fa034adee91b38c7dee52634 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Thu, 30 Nov 2006 18:33:17 +0000
Subject: [PATCH] Backport

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1211 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 ChangeLog                              |   3 +++
 htdocs/images/icons/resultset_next.gif | Bin 0 -> 1034 bytes
 templates/xnet/groupe/asso.tpl         |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/images/icons/resultset_next.gif

diff --git a/ChangeLog b/ChangeLog
index 5bf48a8..920450c 100644
--- 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
index 0000000000000000000000000000000000000000..b71a4f71546d2b23794090eeea7962fb8ec0831e
GIT binary patch
literal 1034
zcmb`GPe>F|9LK-AnS!YeX|{;j>}A`-8lw`d6tTLIt9F=VQS-F3v(xT^u8-N#rrRD=
zga`+`NOV{WVuOgKL+o+rw1$U`N+cvE=rG4X2%=<qZ>JC<>EaLGo6qmhd*7Mgdowb6
zBRnW^;P3&=xJbEFwTq^`QLz)oZppNRr0Nq*PONaTie9oJg_<u><zglmsbq>)!muKG
z%{OfpN>*&O#%HR&gh`54nA8MP(@S=kRK?X@Qrr#eHN9x9maRhBE|hGeY#C*{u6b;e
z|9gW62*B_B9F0aNMutcFguZ^jyDbqi>!mt#IZdT;e){$d-?W2M=yAm*IZuW}@#fL5
z@@)rnZ{S@o+w17Me`Z=#DhPNwXtpEma*%P-<*SVEYDA+oB4artr6|*ZkQ$$eQZ^{J
zrClyEPP$xXyeOyHT9dMnb5hwHb-q$3oKo^KZ2%L~WTMg{?<2~+tO4{%O&bTUod-^A
zAI4_#!1JfTxxis8=mXA90hNKn*#510Q#_s9`8xx&(bPOG!@$W;j<X*Cn%02>!*PB*
zcASGJRAUb?bMk_^Sg)nk-a+7hzWZ_R?(QKlo!^6n|Khz|y#Xu(0oaTIQ_aBmGVt&-
zaPbAu{t6IVf%qW2;V*xN+pPM!uBbGdO{$Wnq<D5=qVu!!YMw~4QcoY>q$xT*6d*cJ
z?y1>yM&pO*{Zgpl99hs5HN=nR<VzvGUl1<WRYPoMKP(!@BI_g;>RPM5ZOq1#8`q6U
zywL1l@vKM>TE>=Mdp`Qb;O3j<EnX5jww9i4>YW!F-oJ!$X0o-XyLmFu-hFx{(B`?n
IW(?uVFK7(ZmH+?%

literal 0
HcmV?d00001

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index ac9f43a..187000d 100644
--- 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}
-- 
2.1.4