Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
5ec7b10d
Commit
5ec7b10d
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch 'marcosgdf-bug-1783' into 3.6
parents
a0de75c7
d1e2ab6f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/class/menubase.class.php
+1
-1
1 addition, 1 deletion
htdocs/core/class/menubase.class.php
with
2 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
5ec7b10d
...
...
@@ -14,6 +14,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #1803 ] AJAX company contact input is not aligned
- Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
- Fix: [ bug #1796 ] Unable to use numeration modules from an external module
- Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON
***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/menubase.class.php
+
1
−
1
View file @
5ec7b10d
...
...
@@ -152,7 +152,7 @@ class Menubase
$sql
.
=
" '"
.
$this
->
fk_menu
.
"',"
;
$sql
.
=
" "
.
(
$this
->
fk_mainmenu
?
"'"
.
$this
->
fk_mainmenu
.
"'"
:
"null"
)
.
","
;
$sql
.
=
" "
.
(
$this
->
fk_leftmenu
?
"'"
.
$this
->
fk_leftmenu
.
"'"
:
"null"
)
.
","
;
$sql
.
=
" '"
.
$this
->
position
.
"',"
;
$sql
.
=
" '"
.
(
int
)
$this
->
position
.
"',"
;
$sql
.
=
" '"
.
$this
->
db
->
escape
(
$this
->
url
)
.
"',"
;
$sql
.
=
" '"
.
$this
->
db
->
escape
(
$this
->
target
)
.
"',"
;
$sql
.
=
" '"
.
$this
->
db
->
escape
(
$this
->
titre
)
.
"',"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment