From: x2000habouzit <x2000habouzit>
Date: Sat, 13 Nov 2004 11:54:28 +0000 (+0000)
Subject: oups, smarty eval is not lazy
X-Git-Tag: xorg/old~969
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=bba0d5fcf1a1f549ca5b87c8030c88083219aeeb;p=platal.git

oups, smarty eval is not lazy
---

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index e51dbc5..25f7ba3 100644
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: advanced_search.php,v 1.28 2004-11-13 11:46:31 x2000habouzit Exp $
+        $Id: advanced_search.php,v 1.29 2004-11-13 11:54:28 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -145,16 +145,6 @@ else {
     
 }
 
-function display_lines($text) {
-    $n = 0;
-    $i=-1;
-    while(($i=strpos($text,'<tr>',$i+1))!==false) $n++;
-    $i=-1;
-    while(($i=strpos($text,'<div class="nom">',$i+1))!==false) $n++;
-    return $n;
-}
-
 $page->register_modifier('display_lines', 'display_lines');
-
 $page->run();
 ?>
diff --git a/htdocs/search.php b/htdocs/search.php
index 6f8de05..2776883 100644
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.php,v 1.47 2004-11-06 17:22:11 x2000habouzit Exp $
+        $Id: search.php,v 1.48 2004-11-13 11:54:28 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -94,5 +94,7 @@ if (array_key_exists('quick', $_REQUEST)) {
 }
 else
     $page->assign('formulaire',1);
+
+$page->register_modifier('display_lines', 'display_lines');
 $page->run();
 ?>
diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index 66b456c..0bfa209 100644
--- a/include/search.classes.inc.php
+++ b/include/search.classes.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.classes.inc.php,v 1.31 2004-11-13 11:02:47 x2000habouzit Exp $
+        $Id: search.classes.inc.php,v 1.32 2004-11-13 11:54:28 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once("xorg.misc.inc.php");
@@ -49,6 +49,14 @@ $globals->search_result_where_statement = '
                 LEFT JOIN  geoloc_pays    AS gp  ON (adr.pays = gp.a2)
                 LEFT JOIN  geoloc_region  AS gr  ON (adr.pays = gr.a2 AND adr.region = gr.region)';
 
+function display_lines($text) {
+    $n = 0;
+    $i=-1;
+    while(($i=strpos($text,'<tr>',$i+1))!==false) $n++;
+    $i=-1;
+    while(($i=strpos($text,'<div class="nom">',$i+1))!==false) $n++;
+    return $n;
+}
 
 /** classe qui gère les erreurs dans les requêtes des utilisateurs finaux
  * passe le message d'erreur au template de page et exécute le template