From bc2f693de917d231a0ce397fdc6a4ac309787813 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 21 May 2006 11:30:05 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Picto=20"cr=E9er"=20bookmark=20condition?= =?UTF-8?q?n=E9=20sur=20les=20droits=20et=20activation=20du=20module.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/modules/modBookmark.class.php | 4 ++-- htdocs/lib/company.lib.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php index c8a3284fbdf..8fe5b8246b5 100644 --- a/htdocs/includes/modules/modBookmark.class.php +++ b/htdocs/includes/modules/modBookmark.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2005-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index e9652bd8075..ff9e4bade09 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -31,7 +31,7 @@ function societe_prepare_head($objsoc) { - global $langs, $conf; + global $langs, $conf, $user; $h = 0; $head = array(); @@ -97,7 +97,7 @@ function societe_prepare_head($objsoc) $head[$h][2] = 'info'; $h++; - if ($user->societe_id == 0) + if ($conf->bookmark->enabled && $user->rights->bookmark->creer) { $head[$h][0] = DOL_URL_ROOT."/bookmarks/fiche.php?action=add&socid=".$objsoc->id."&urlsource=".$_SERVER["PHP_SELF"]."?socid=".$objsoc->id; $head[$h][1] = img_object($langs->trans("BookmarkThisPage"),'bookmark');