From 34987d3e8b2802d814f33dd9bb85c1f788f6351f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 10 Aug 2013 13:02:13 +0200 Subject: [PATCH 1/2] Exclude conf.php file from git --- htdocs/conf/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/conf/.gitignore b/htdocs/conf/.gitignore index da65ac7c6c9..ed21fdfaa4c 100644 --- a/htdocs/conf/.gitignore +++ b/htdocs/conf/.gitignore @@ -1,3 +1,4 @@ +/conf.php /conf.php.old /conf.php.sav /conf.php.mysql From 49e38e1263a4d637f9cee967e80372899817ce36 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 16 Aug 2013 10:16:06 +0200 Subject: [PATCH 2/2] fix some trad --- htdocs/core/boxes/modules_boxes.php | 2 +- htdocs/core/lib/pdf.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 2e4a809cc04..abae94b9749 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -27,7 +27,7 @@ /** * Parent class of boxes */ -class ModeleBoxes // Can't be abtract as it is instanciated to build "empty" boxes +class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes { var $db; var $error=''; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 098ad08812e..449af00e68c 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -66,7 +66,7 @@ function pdf_getFormat() } /** - * Return a PDF instance object. We create a FPDI instance that instanciate TCPDF. + * Return a PDF instance object. We create a FPDI instance that instantiate TCPDF. * * @param string $format Array(width,height). Keep empty to use default setup. * @param string $metric Unit of format ('mm')