From: x2000habouzit <x2000habouzit>
Date: Tue, 24 Aug 2004 20:05:34 +0000 (+0000)
Subject: fixes
X-Git-Tag: xorg/old~1716
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=190b9d35dec5a4752e88b6351e90cc9f8762c055;p=platal.git

fixes
---

diff --git a/htdocs/search.php b/htdocs/search.php
index cd809e2..84e3afd 100644
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -32,7 +32,7 @@ if (array_key_exists('rechercher', $_REQUEST)) {
     $fields = new SFieldGroup(true,array($nameField,$firstnameField,$promo1Field,$promo2Field));
     
     if ($nameField->length()<2 && $firstnameField->length()<2 && 
-        ($public_directory || !$promo1Field->is_a_single_promo()))
+        (!logged() || !$promo1Field->is_a_single_promo()))
     {
 	new ThrowError('Recherche trop générale.');
     }
@@ -65,7 +65,7 @@ if (array_key_exists('rechercher', $_REQUEST)) {
 
     $page->mysql_assign($sql, 'resultats', 'nb_resultats','nb_resultats_total');
     
-    if ($public_directory &&
+    if (!logged() &&
 	$page->get_template_vars('nb_resultats_total')>$globals->public_max_search_results)
     {
 	new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.');
diff --git a/templates/newsletter.tpl b/templates/newsletter.tpl
index a6866ec..41eff94 100644
--- a/templates/newsletter.tpl
+++ b/templates/newsletter.tpl
@@ -1,4 +1,4 @@
-{* $Id: newsletter.tpl,v 1.4 2004-07-17 11:23:09 x2000habouzit Exp $ *}
+{* $Id: newsletter.tpl,v 1.5 2004-08-24 20:05:35 x2000habouzit Exp $ *}
 
 {dynamic}
 
@@ -17,7 +17,7 @@
   </tr>
   <tr>
     <td style="padding: 1em;">
-      <tt>{$nl_text|replace:" ":"&nbsp;"|nl2br}</tt>
+      <tt>{$nl_text|smarty:nodefaults|replace:" ":"&nbsp;"|nl2br}</tt>
     </td>
   </tr>
 </table>
diff --git a/templates/skin/common.devel.tpl b/templates/skin/common.devel.tpl
index 125d7c5..8f39576 100644
--- a/templates/skin/common.devel.tpl
+++ b/templates/skin/common.devel.tpl
@@ -1,4 +1,4 @@
-{* $Id: common.devel.tpl,v 1.1 2004-02-20 11:44:07 x2000habouzit Exp $ *}
+{* $Id: common.devel.tpl,v 1.2 2004-08-24 20:05:35 x2000habouzit Exp $ *}
 
 {if $validate}
   <div id="dev">
@@ -21,7 +21,7 @@
       Trace de l'exécution de cette page sur mysql (hover me)
     </div>
     <div class="hide">
-  {$db_trace}
+      {$db_trace|smarty:nodefaults}
     </div>
   </div>
 {/if}