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
f3ef4fed
Commit
f3ef4fed
authored
9 years ago
by
Marcos García de La Fuente
Browse files
Options
Downloads
Patches
Plain Diff
Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
Close #3313
parent
6b2d7f7d
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 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
htdocs/core/modules/DolibarrModules.class.php
+0
-3
0 additions, 3 deletions
htdocs/core/modules/DolibarrModules.class.php
with
2 additions
and
4 deletions
ChangeLog
+
1
−
0
View file @
f3ef4fed
...
...
@@ -27,6 +27,7 @@ Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid
Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter
Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result
Fix: [ bug #1791 ] Margin menu not available if any Finance module is not enabled
Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/menubase.class.php
+
1
−
1
View file @
f3ef4fed
...
...
@@ -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.
htdocs/core/modules/DolibarrModules.class.php
+
0
−
3
View file @
f3ef4fed
...
...
@@ -1009,7 +1009,6 @@ abstract class DolibarrModules
$this
->
db
->
begin
();
//var_dump($this->menu); exit;
foreach
(
$this
->
menu
as
$key
=>
$value
)
{
$menu
=
new
Menubase
(
$this
->
db
);
...
...
@@ -1018,11 +1017,9 @@ abstract class DolibarrModules
if
(
!
$this
->
menu
[
$key
][
'fk_menu'
])
{
$menu
->
fk_menu
=
0
;
//print 'aaa'.$this->menu[$key]['fk_menu'];
}
else
{
//print 'xxx'.$this->menu[$key]['fk_menu'];exit;
$foundparent
=
0
;
$fk_parent
=
$this
->
menu
[
$key
][
'fk_menu'
];
if
(
preg_match
(
'/^r=/'
,
$fk_parent
))
// old deprecated method
...
...
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