[SPIP] ~maj v3.0.14-->v3.0.17

[ptitvelo/web/www.git] / www / plugins-dist / vertebres / public / vertebrer.php

diff --git a/www/plugins-dist/vertebres/public/vertebrer.php b/www/plugins-dist/vertebres/public/vertebrer.php
old mode 100755 (executable)
new mode 100644 (file)
index 66a3d77..4cca599
--- a/www/plugins-dist/vertebres/public/vertebrer.php
+++ b/www/plugins-dist/vertebres/public/vertebrer.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2013                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -73,7 +73,7 @@ function vertebrer_crit($v)
 {
        $res = "";
        foreach($v as $n => $t) {
-               if (!in_array($n, array('date', 'date_redac', 'lang')))
+               if (!in_array($n, array('date', 'date_redac', 'lang', 'recherche','logo')))
                        $res .= "\n\t\t{" . $n .  " ?}";
        }
        return $res;
@@ -91,7 +91,7 @@ function vertebrer_cell($fields)
 {
        $res = "";
        foreach($fields as $n => $t) {
-               $texte = "#" . strtoupper($n);
+               $texte = "#CHAMP_SQL{".$n."}";
                if (preg_match('/\s+references\s+([\w_]+)/' , $t, $r)) {
                        $url = "[(#SELF|parametre_url{page,'" . $r[1] . "'})]";
                        $texte = "<a href='$url'>" . $texte . "</a>";