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
20262a01
Commit
20262a01
authored
11 years ago
by
Marcos García de La Fuente
Browse files
Options
Downloads
Patches
Plain Diff
Fix bug #1295: Error when creating an agenda extrafield with a number as reference
parent
ccc40362
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/db/mysql.class.php
+1
-1
1 addition, 1 deletion
htdocs/core/db/mysql.class.php
htdocs/core/db/mysqli.class.php
+1
-1
1 addition, 1 deletion
htdocs/core/db/mysqli.class.php
with
3 additions
and
2 deletions
ChangeLog
+
1
−
0
View file @
20262a01
...
...
@@ -40,6 +40,7 @@ Fix: [ bug #520 ] Product statistics and detailed lists are wrong.
Fix: [ bug #1240 ] traduction.
Fix: [ bug #1238 ] When creating accompte with a %, free product are used for calculation.
Fix: [ bug #1280 ] service with not end of date was tagged as expired.
Fix: [ bug #1295 ] Error when creating an agenda extrafield with a number as reference
***** ChangeLog for 3.5 compared to 3.4.* *****
For users:
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/db/mysql.class.php
+
1
−
1
View file @
20262a01
...
...
@@ -985,7 +985,7 @@ class DoliDBMysql extends DoliDB
{
// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql
=
"ALTER TABLE "
.
$table
.
" ADD "
.
$field_name
.
" "
;
$sql
=
"ALTER TABLE "
.
$table
.
" ADD
`
"
.
$field_name
.
"
`
"
;
$sql
.
=
$field_desc
[
'type'
];
if
(
preg_match
(
"/^[^\s]/i"
,
$field_desc
[
'value'
]))
if
(
!
in_array
(
$field_desc
[
'type'
],
array
(
'date'
,
'datetime'
)))
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/db/mysqli.class.php
+
1
−
1
View file @
20262a01
...
...
@@ -979,7 +979,7 @@ class DoliDBMysqli extends DoliDB
{
// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql
=
"ALTER TABLE "
.
$table
.
" ADD "
.
$field_name
.
" "
;
$sql
=
"ALTER TABLE "
.
$table
.
" ADD
`
"
.
$field_name
.
"
`
"
;
$sql
.
=
$field_desc
[
'type'
];
if
(
preg_match
(
"/^[^\s]/i"
,
$field_desc
[
'value'
]))
if
(
!
in_array
(
$field_desc
[
'type'
],
array
(
'date'
,
'datetime'
)))
...
...
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