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
a6b0b22e
Commit
a6b0b22e
authored
13 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Finish function
parent
14690cb9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/core/lib/date.lib.php
+2
-3
2 additions, 3 deletions
htdocs/core/lib/date.lib.php
with
2 additions
and
3 deletions
htdocs/core/lib/date.lib.php
+
2
−
3
View file @
a6b0b22e
...
@@ -228,7 +228,7 @@ function ConvertSecondToTime($iSecond,$format='all',$lengthOfDay=86400,$lengthOf
...
@@ -228,7 +228,7 @@ function ConvertSecondToTime($iSecond,$format='all',$lengthOfDay=86400,$lengthOf
* @param int $gm 1 =Input date is GM date,
* @param int $gm 1 =Input date is GM date,
* 0 =Input date is local date using PHP server timezone
* 0 =Input date is local date using PHP server timezone
* -1=Input date is local date using timezone provided as third parameter
* -1=Input date is local date using timezone provided as third parameter
* @param string $tz Timezone to use
of
$gm=-1
* @param string $tz Timezone to use
. This means param
$gm=-1
* @return date Date
* @return date Date
* 19700101020000 -> 7200 with gm=1
* 19700101020000 -> 7200 with gm=1
*
*
...
@@ -280,8 +280,7 @@ function dol_stringtotime($string, $gm=1, $tz='')
...
@@ -280,8 +280,7 @@ function dol_stringtotime($string, $gm=1, $tz='')
$date
=
dol_mktime
(
substr
(
$tmp
,
8
,
2
),
substr
(
$tmp
,
10
,
2
),
substr
(
$tmp
,
12
,
2
),
substr
(
$tmp
,
4
,
2
),
substr
(
$tmp
,
6
,
2
),
substr
(
$tmp
,
0
,
4
),(
$gm
?
1
:
0
));
$date
=
dol_mktime
(
substr
(
$tmp
,
8
,
2
),
substr
(
$tmp
,
10
,
2
),
substr
(
$tmp
,
12
,
2
),
substr
(
$tmp
,
4
,
2
),
substr
(
$tmp
,
6
,
2
),
substr
(
$tmp
,
0
,
4
),(
$gm
?
1
:
0
));
if
(
$gm
==
-
1
)
if
(
$gm
==
-
1
)
{
{
// TODO Define offset according to TZ
$date
=
dol_time_plus_timezone
(
$date
,
$tz
);
$date
+=
0
;
}
}
return
$date
;
return
$date
;
}
}
...
...
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