Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
This commit is contained in:
commit
6505e41b4d
2 changed files with 3 additions and 2 deletions
|
|
@ -88,6 +88,7 @@ install:
|
|||
#composer -n init
|
||||
#composer -n config vendor-dir htdocs/includes
|
||||
composer -n config -g vendor-dir htdocs/includes
|
||||
composer -n config audit.block-insecure false
|
||||
echo
|
||||
|
||||
- |
|
||||
|
|
@ -272,7 +273,7 @@ script:
|
|||
echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)"
|
||||
# Ensure we catch errors
|
||||
set -e
|
||||
#parallel-lint --exclude htdocs/includes --blame .
|
||||
parallel-lint --exclude htdocs/includes --blame .
|
||||
# Exclusions are defined in the ruleset.xml file
|
||||
if [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then
|
||||
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ class Users extends DolibarrApi
|
|||
public function post($request_data = null)
|
||||
{
|
||||
// Check user authorization
|
||||
if (empty(DolibarrApiAccess::$user->rights->user->creer) && empty(DolibarrApiAccess::$user->admin)) {
|
||||
if (empty(DolibarrApiAccess::$user->rights->user->user->creer) && empty(DolibarrApiAccess::$user->admin)) {
|
||||
throw new RestException(401, "User creation not allowed for login ".DolibarrApiAccess::$user->login);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue