From 56d71f0da0a8b4943f556d6a6d75dd6f38f2ccd5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 29 May 2014 19:56:15 +0200 Subject: [PATCH] Fix: edit form Fix: pgsql driver --- htdocs/core/class/html.form.class.php | 7 ++++--- htdocs/core/db/pgsql.class.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d16c9f19a5a..ccc5b915aac 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -191,8 +191,9 @@ class Form $ret.=''; if ($typeofdata != 'day' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker') { - $ret.=''; - $ret.='

'."\n"; + $ret.=''; + $ret.=''; + $ret.='
'."\n"; $ret.=''; $ret.=''; } @@ -4091,7 +4092,7 @@ class Form //Check if fetch_barcode() failed if ($result < 1) return ''; } - + // Barcode image $url=DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code); $out =''; diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index b5de2d57f80..155977cc8d1 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -172,7 +172,7 @@ class DoliDBPgsql extends DoliDB else if (preg_match('/DROP TABLE/i',$line)) $type='dml'; } - $line=preg_replace('/ as signed/i',' as integer',$line); + $line=preg_replace('/ as signed\)/i',' as integer)',$line); if ($type == 'dml') {