diff --git a/build.xml b/build.xml index b93db6e37f6..b5174488205 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ - + @@ -41,46 +41,44 @@ - + - + diff --git a/build/doxygen/hudson-doxygen.doxyfile b/build/doxygen/hudson-doxygen.doxyfile index ee6a4166eee..1a868d74ad0 100644 --- a/build/doxygen/hudson-doxygen.doxyfile +++ b/build/doxygen/hudson-doxygen.doxyfile @@ -611,7 +611,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie +EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 31c7ac3d7f4..84b0d47377a 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1695,7 +1695,7 @@ class Propal extends CommonObject } $this->db->free($resql); - $nump = sizeOf($tab_sqlobj); + $nump = count($tab_sqlobj); if ($nump) { diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index cd059cdbfeb..103b8bde928 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -240,7 +240,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $tab_sqlobj[$key] = unserialize(trim($value, "'")); } - $num = sizeOf($tab_sqlobj); + $num = count($tab_sqlobj); //$num = $db->num_rows($result); $i = 0; diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/hudson_phpunittest.xml index c2fc5559912..d7370618ba7 100644 --- a/test/phpunit/hudson_phpunittest.xml +++ b/test/phpunit/hudson_phpunittest.xml @@ -15,10 +15,9 @@ ../../build/ ../../dev/ ../../doc/ - ../../htdocs/CVS/ ../../test/ + ../../htdocs/core/filemanagerdol/ ../../htdocs/custom/ - ../../htdocs/custom2/ ../../htdocs/products/canvas/ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ @@ -53,10 +52,9 @@ ../../build/ ../../dev/ ../../doc/ - ../../htdocs/CVS/ ../../test/ + ../../htdocs/core/filemanagerdol/ ../../htdocs/custom/ - ../../htdocs/custom2/ ../../htdocs/products/canvas/ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/