Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
4634d213
Commit
4634d213
authored
8 years ago
by
Peter Rotich
Browse files
Options
Downloads
Patches
Plain Diff
fixes: Minor bug fixes
parent
1e6d0df5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/class.forms.php
+1
-1
1 addition, 1 deletion
include/class.forms.php
include/html2text.php
+1
-1
1 addition, 1 deletion
include/html2text.php
with
2 additions
and
2 deletions
include/class.forms.php
+
1
−
1
View file @
4634d213
...
@@ -1766,7 +1766,7 @@ class DatetimeField extends FormField {
...
@@ -1766,7 +1766,7 @@ class DatetimeField extends FormField {
function
to_database
(
$value
)
{
function
to_database
(
$value
)
{
// Store time in gmt time, unix epoch format
// Store time in gmt time, unix epoch format
return
date
(
'Y-m-d H:i:s'
,
$value
);
return
$value
?
date
(
'Y-m-d H:i:s'
,
$value
)
:
$value
;
}
}
function
to_php
(
$value
)
{
function
to_php
(
$value
)
{
...
...
This diff is collapsed.
Click to expand it.
include/html2text.php
+
1
−
1
View file @
4634d213
...
@@ -1014,7 +1014,7 @@ function mb_wordwrap($string, $width=75, $break="\n", $cut=false) {
...
@@ -1014,7 +1014,7 @@ function mb_wordwrap($string, $width=75, $break="\n", $cut=false) {
}
else
{
}
else
{
// Anchor the beginning of the pattern with a lookahead
// Anchor the beginning of the pattern with a lookahead
// to avoid crazy backtracking when words are longer than $width
// to avoid crazy backtracking when words are longer than $width
$
pattern
=
'/(?=[\s\p{Ps}])(.{1,'
.
$width
.
'})(?:\s|$|(\p{Ps}))/uS'
;
$
search
=
'/(?=[\s\p{Ps}])(.{1,'
.
$width
.
'})(?:\s|$|(\p{Ps}))/uS'
;
$replace
=
'$1'
.
$break
.
'$2'
;
$replace
=
'$1'
.
$break
.
'$2'
;
}
}
return
rtrim
(
preg_replace
(
$search
,
$replace
,
$string
),
$break
);
return
rtrim
(
preg_replace
(
$search
,
$replace
,
$string
),
$break
);
...
...
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