Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
eeae12ed63
6 changed files with 11 additions and 11 deletions
|
|
@ -820,8 +820,8 @@ if (empty($reshook)) {
|
|||
$db->rollback();
|
||||
|
||||
$action = 'create';
|
||||
$_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ?
|
||||
$_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ?
|
||||
$_GET["origin"] = GETPOST("origin", 'alpha');
|
||||
$_GET["originid"] = GETPOSTINT("originid");
|
||||
if (!empty($errors)) {
|
||||
setEventMessages(null, $errors, 'errors');
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -2296,8 +2296,8 @@ if (empty($reshook)) {
|
|||
} else {
|
||||
$db->rollback();
|
||||
$action = 'create';
|
||||
$_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ?
|
||||
$_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ?
|
||||
$_GET["origin"] = GETPOST("origin", 'alpha');
|
||||
$_GET["originid"] = GETPOSTINT("originid");
|
||||
setEventMessages($object->error, $object->errors, 'errors');
|
||||
}
|
||||
} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && (GETPOST('alldate_start', 'alpha') || GETPOST('alldate_end', 'alpha')) && $usercancreate) {
|
||||
|
|
|
|||
|
|
@ -611,8 +611,8 @@ if (empty($reshook)) {
|
|||
$db->rollback();
|
||||
|
||||
$action = 'create';
|
||||
$_GET["origin"] = $_POST["origin"];
|
||||
$_GET["originid"] = $_POST["originid"];
|
||||
$_GET["origin"] = GETPOST("origin", 'alpha');
|
||||
$_GET["originid"] = GETPOSTINT("originid");
|
||||
if (!empty($errors)) {
|
||||
setEventMessages(null, $errors, 'errors');
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -790,8 +790,8 @@ if (empty($reshook)) {
|
|||
} else {
|
||||
$db->rollback();
|
||||
$action = 'create';
|
||||
$_GET["origin"] = $_POST["origin"]; // Keep this ?
|
||||
$_GET["originid"] = $_POST["originid"]; // Keep this ?
|
||||
$_GET["origin"] = GETPOST("origin", 'alpha');
|
||||
$_GET["originid"] = GETPOSTINT("originid");
|
||||
setEventMessages("Error", null, 'errors');
|
||||
$error++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -612,8 +612,8 @@ if (empty($reshook)) {
|
|||
$db->rollback();
|
||||
|
||||
$action = 'create';
|
||||
$_GET["origin"] = $_POST["origin"]; // Keep this ?
|
||||
$_GET["originid"] = $_POST["originid"]; // Keep this ?
|
||||
$_GET["origin"] = GETPOST("origin", 'alpha');
|
||||
$_GET["originid"] = GETPOSTINT("originid");
|
||||
setEventMessages($object->error, $errors, 'errors');
|
||||
$error++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ if (isset($_GET["modulepart"])) {
|
|||
// Some value of modulepart can be used to get resources that are public so no login are required.
|
||||
|
||||
// For logo of company (by definition, the company logo is public)
|
||||
if ($_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file'])) {
|
||||
if ($_GET["modulepart"] == 'mycompany' && isset($_GET['file']) && preg_match('/^\/?logos\//', $_GET['file'])) {
|
||||
$needlogin = 0;
|
||||
}
|
||||
// For barcode live generation (barcode are just a graph of a value, so can be public)
|
||||
|
|
|
|||
Loading…
Reference in a new issue