From fe374dec9ac56f55bb065c0174233ec99c3e3f26 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:45:11 +0000 Subject: [PATCH] Fix: Avoid errors into rpm packages --- htdocs/contrat/fiche.php | 6 +++--- htdocs/core/class/conf.class.php | 5 ++--- htdocs/core/class/cookie.class.php | 5 ++--- htdocs/core/class/translate.class.php | 7 +++---- htdocs/imports/import.php | 7 +++---- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..acb0b5d9167 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) - * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /*