lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2

Browse Source
This commit is contained in:
Laurent Destailleur 2012-10-01 20:52:50 +02:00
commit 10e72d70ae
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fichinter/list.php
View File

@ -96,7 +96,7 @@ if ($result)
$interventionstatic=new Fichinter($db);
$urlparam="&socid=$socid";
print_barre_liste($langs->trans("ListOfInterventions"), $page, "index.php",$urlparam,$sortfield,$sortorder,'',$num);
print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER["PHP_SELF"],$urlparam,$sortfield,$sortorder,'',$num);
print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
print '<table class="noborder" width="100%">';

21
htdocs/filefunc.inc.php
View File

@ -53,10 +53,8 @@ if (! defined('LOG_DEBUG'))
}
}
// Force PHP error_reporting setup (Dolibarr may report warning without this)
if (! defined('E_DEPRECATED')) define('E_DEPRECATED',0); // For PHP < 5.3.0 compatibility
error_reporting(E_ALL & ~(E_STRICT|E_NOTICE|E_DEPRECATED));
//error_reporting(E_ALL | E_STRICT);
// End of common declaration part
if (defined('DOL_INC_FOR_VERSION_ERROR')) return;
// Define vars
@ -77,12 +75,19 @@ if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not do
exit;
}
// Force PHP error_reporting setup (Dolibarr may report warning without this)
if (! empty($dolibarr_strict_mode))
{
error_reporting(E_ALL | E_STRICT);
}
else
{
if (! defined('E_DEPRECATED')) define('E_DEPRECATED',0); // For PHP < 5.3.0 compatibility
error_reporting(E_ALL & ~(E_STRICT|E_NOTICE|E_DEPRECATED));
}
// Disable php display errors
if (! empty($dolibarr_main_prod))
{
ini_set('display_errors','Off');
}
if (! empty($dolibarr_main_prod)) ini_set('display_errors','Off');
// Clean parameters
$dolibarr_main_data_root=trim($dolibarr_main_data_root);

2
htdocs/master.inc.php
View File

@ -74,6 +74,8 @@ if (! empty($dolibarr_main_document_root_alt))
}
// Force db type (for test purpose)
if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE');
// Force php strict mode (for debug)
$conf->file->strict_mode = empty($dolibarr_strict_mode)?'':$dolibarr_strict_mode;
// Force Multi-Company transverse mode
$conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode;
// Force entity in login page