From 2fa26555de513fc8f042feb2090d0e46a1b4ba02 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 17 Jul 2011 19:08:33 +0000 Subject: [PATCH] Fix: deliveray date must not be mandatory --- htdocs/core/class/menubase.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index a8b4f4ff5a8..fd39396163f 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -20,7 +20,7 @@ /** * \file htdocs/core/class/menubase.class.php * \ingroup core - * \version $Id: menubase.class.php,v 1.26 2011/07/17 19:56:51 hregis Exp $ + * \version $Id: menubase.class.php,v 1.25 2011/07/13 22:18:48 eldy Exp $ * \brief File of class to manage dynamic menu entries * \remarks Initialy built by build_class_from_table on 2008-01-12 14:19 */ @@ -577,12 +577,11 @@ class Menubase $tabMenu[$b][0] = $menu['rowid']; $tabMenu[$b][1] = $menu['fk_menu']; $tabMenu[$b][2] = $menu['url']; - // FIXME idmenu is already added in auguria.lib.php - /*if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2])) + if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2])) { if (preg_match('/\?/',$tabMenu[$b][2])) $tabMenu[$b][2].='&idmenu='.$menu['rowid']; else $tabMenu[$b][2].='?idmenu='.$menu['rowid']; - }*/ + } $tabMenu[$b][3] = $chaine; $tabMenu[$b][5] = $menu['target']; $tabMenu[$b][6] = $menu['leftmenu'];