Fix the 'view as text' link for NLs (Closes #1395)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index 6a1060e..b8c248e 100644 (file)
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -433,7 +433,7 @@ class NewsLetter
     /** Get the prefix leading to the page for this NL
      * Only X.org / AX / X groups may be seen on X.org.
      */
-    public function prefix()
+    public function prefix($enforce_xnet=true)
     {
         if (!empty($GLOBALS['IS_XNET_SITE'])) {
             return $this->group . '/nl';
@@ -447,7 +447,7 @@ class NewsLetter
             return 'epletter';
         default:
             // Don't display groups NLs on X.org
-            assert(false);
+            assert(!$enforce_xnet);
         }
     }
 

diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl
index 39f83a6..d81ff65 100644 (file)
--- a/templates/newsletter/show.tpl
+++ b/templates/newsletter/show.tpl
@@ -26,9 +26,9 @@
 
 <p style="float: left">
   {if $smarty.get.text}
-  [<a href='nl/show/{$issue->id()}'>version HTML</a>]
+  [<a href='{$nl->prefix()}/show/{$issue->id()}'>version HTML</a>]
   {else}
-  [<a href='nl/show/{$issue->id()}?text=1'>version Texte</a>]
+  [<a href='{$nl->prefix()}/show/{$issue->id()}?text=1'>version Texte</a>]
   {/if}
   {if $nl->mayEdit()}
   [<a href='{$nl->adminPrefix()}/edit/{$issue->id()}'>Éditer</a>]