diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 79f7955bb13..7cabdc17b70 100755
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -436,7 +436,7 @@ print "
";
print '';
-$db->close();
-
llxFooter();
+
+$db->close();
?>
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index 398fc8eb926..8554e5030e3 100755
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -29,3 +29,5 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN date_cloture date_approve datetime;
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_user_cloture fk_user_approve integer;
+
+ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql
index 4d8e6d57cf4..aad9949d2d9 100644
--- a/htdocs/install/mysql/tables/llx_mailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing.sql
@@ -30,7 +30,7 @@ create table llx_mailing
titre varchar(60), -- Ref of mailing
entity integer DEFAULT 1 NOT NULL, -- multi company id
sujet varchar(60), -- Sujet of mailing
- body text,
+ body mediumtext,
bgcolor varchar(8), -- Backgroud color of mailing
bgimage varchar(255), -- Backgroud image of mailing
cible varchar(60),
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index e9ebdd00d1c..68af1d9aee3 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -465,14 +465,14 @@ class Project extends CommonObject
// End call triggers
}
- dol_syslog("Project::delete sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::delete sql=" . $sql, LOG_DEBUG);
$this->db->commit();
return 1;
}
else
{
$this->error = $this->db->lasterror();
- dol_syslog("Project::delete " . $this->error, LOG_ERR);
+ dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 225b5343757..a2b9e337f26 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2010 Regis Houssin
+/* Copyright (C) 2008-2012 Laurent Destailleur
+ * Copyright (C) 2010_2012 Regis Houssin
*
* 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
@@ -368,8 +368,6 @@ class Task extends CommonObject
}
else
{
- $this->db->free($resql);
-
//Delete associated link file
if ($conf->projet->dir_output)
{
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index ffe7f19e6a0..41073db30cc 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -60,8 +60,8 @@ class AllTests
{
$suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
- require_once dirname(__FILE__).'/CoreTest.php';
- $suite->addTestSuite('CoreTest');
+ //require_once dirname(__FILE__).'/CoreTest.php';
+ //$suite->addTestSuite('CoreTest');
require_once dirname(__FILE__).'/AdminLibTest.php';
$suite->addTestSuite('AdminLibTest');
require_once dirname(__FILE__).'/DateLibTest.php';
@@ -72,7 +72,7 @@ class AllTests
$suite->addTestSuite('ImagesLibTest');
require_once dirname(__FILE__).'/FunctionsTest.php';
$suite->addTestSuite('FunctionsTest');
- require_once dirname(__FILE__).'/NumberingModulesTest.php';
+ require_once dirname(__FILE__).'/_NumberingModulesTest.php';
$suite->addTestSuite('NumberingModulesTest');
require_once dirname(__FILE__).'/PdfDocTest.php';
$suite->addTestSuite('PdfDocTest');
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 7ca6b78856b..24101beedbe 100755
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -26,6 +26,7 @@
global $conf,$user,$langs,$db;
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');
if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');