inc-balises.php3 inc-calcul-outils.php3 1.29 1.18 1.30 1.19

Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv11193

Modified Files:
  inc-balises.php3 inc-calcul-outils.php3
Log Message:
LOGO_RUBRIQUE = LOGO_RUBRIQUE_RUBRIQUE ...

Index: inc-calcul-outils.php3

RCS file: /home/spip-cvs/spip/inc-calcul-outils.php3,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- inc-calcul-outils.php3 25 Oct 2004 19:23:56 -0000 1.18
+++ inc-calcul-outils.php3 26 Oct 2004 10:22:43 -0000 1.19
@@ -54,7 +54,7 @@
          $align);
     }
       }
- else if ($id_rubrique)
+ else if ($id_rubrique !== false)
       {$type = 'rub'; $id = $id_rubrique; $id_rubrique = 0;}
     else if ($type = 'rub') $id = sql_parent($id);
     if (!$id) return '';

Index: inc-balises.php3

RCS file: /home/spip-cvs/spip/inc-balises.php3,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- inc-balises.php3 25 Oct 2004 23:36:55 -0000 1.29
+++ inc-balises.php3 26 Oct 2004 10:22:43 -0000 1.30
@@ -626,7 +626,7 @@
       "', $_id_objet," .
       (($suite_logo == '_RUBRIQUE') ?
        champ_sql("id_rubrique", $p) :
- (($type_objet == 'RUBRIQUE') ? $_id_objet : "''")) .
+ (($type_objet == 'RUBRIQUE') ? "sql_parent($_id_objet)" : false)) .
       ", $code_lien, '$flag_fichier')";
   }
   $p->statut = 'php';