Index: kernel/content/tipafriend.php
===================================================================
--- kernel/content/tipafriend.php	(révision 23534)
+++ kernel/content/tipafriend.php	(copie de travail)
@@ -149,6 +149,7 @@
         $mailtpl->setVariable( 'hostname', $hostName );
         $mailtpl->setVariable( 'nodename', $nodeName );
         $mailtpl->setVariable( 'node_id', $NodeID );
+        $mailtpl->setVariable( 'node', $node );
         $mailtpl->setVariable( 'your_name', $yourName );
         $mailtpl->setVariable( 'your_email', $yourEmail );
         $mailtpl->setVariable( 'receivers_name', $receiversName );
@@ -179,14 +180,14 @@
         }
         if ( $http->hasPostVariable( 'RedirectBack' ) && $http->postVariable( 'RedirectBack' ) == 1 )
         {
-            $Module->redirectTo( '/content/view/full/' . $NodeID );
+            $Module->redirectTo( $node->attribute( 'url_alias' ) );
             return;
         }
     }
 }
 else if ( $http->hasPostVariable( 'CancelButton' ) )
 {
-    $Module->redirectTo( '/content/view/full/' . $NodeID );
+    $Module->redirectTo( $node->attribute( 'url_alias' ) );
 }
 
 if ( !$overrideKeysAreSet )
@@ -209,6 +210,7 @@
 $Module->setTitle( 'Tip a friend' );
 
 $tpl->setVariable( 'node_id', $NodeID );
+$tpl->setVariable( 'node', $node );
 $tpl->setVariable( 'error_strings', $error_strings );
 $tpl->setVariable( 'your_name', $yourName );
 $tpl->setVariable( 'your_email', $yourEmail );
Index: design/standard/templates/content/tipafriend.tpl
===================================================================
--- design/standard/templates/content/tipafriend.tpl	(révision 23534)
+++ design/standard/templates/content/tipafriend.tpl	(copie de travail)
@@ -7,14 +7,14 @@
   {case match="confirm"}
     <div class="feedback">
       <h2>{"The message was sent."|i18n("design/standard/content/tipafriend")}</h2>
-      <p><a href={concat("/content/view/full/",$node_id)|ezurl}>{"Click here to return to the original page."|i18n("design/standard/content/tipafriend")}</a></p>
+      <p><a href={$node.url_alias|ezurl}>{"Click here to return to the original page."|i18n("design/standard/content/tipafriend")}</a></p>
     </div>
   {/case}
   {case match="error"}
     <div class="warning">
       <h2>{"The message was not sent."|i18n("design/standard/content/tipafriend")}</h2>
       <p>{"The message was not sent due to an unknown error. Please notify the site administrator about this error."|i18n("design/standard/content/tipafriend")}</p>
-      <p><a href={concat("/content/view/full/",$node_id)|ezurl}>{"Click here to return to the original page."|i18n("design/standard/content/tipafriend")}</a></p>
+      <p><a href={concat($node.url_alias)|ezurl}>{"Click here to return to the original page."|i18n("design/standard/content/tipafriend")}</a></p>
     </div>
   {/case}
   {case}
Index: design/standard/templates/content/tipafriendmail.tpl
===================================================================
--- design/standard/templates/content/tipafriendmail.tpl	(révision 23534)
+++ design/standard/templates/content/tipafriendmail.tpl	(copie de travail)
@@ -1,5 +1,4 @@
 {* DO NOT EDIT THIS FILE! Use an override template instead. *}
-{let node=fetch( content, node, hash( node_id, $node_id ) )}
 {'This message was sent to you because "%1 <%2>" thought you might find the page "%3" at %4 interesting.'|i18n("design/standard/content/tipafriend",,array($your_name,$your_email,$nodename,$hostname))}
 
 {"This is the link to the page"|i18n("design/standard/content/tipafriend")}:
@@ -8,4 +7,3 @@
 {'Comment by "%1 <%2>"'|i18n("design/standard/content/tipafriend",,array($your_name,$your_email))}:
 {$comment}
 
-{/let}
\ No newline at end of file