Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
UserAdminV2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
庄欣
UserAdminV2
Commits
a3e0c7c0
Commit
a3e0c7c0
authored
13 years ago
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #522 from kloy/master
Custom validation messages in language file fix.
parents
9ee9e7bb
53e8f9b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
laravel/validator.php
+8
-8
No files found.
laravel/validator.php
View file @
a3e0c7c0
...
...
@@ -559,7 +559,7 @@ class Validator {
protected
function
validate_active_url
(
$attribute
,
$value
)
{
$url
=
str_replace
(
array
(
'http://'
,
'https://'
,
'ftp://'
),
''
,
Str
::
lower
(
$value
));
return
checkdnsrr
(
$url
);
}
...
...
@@ -608,7 +608,7 @@ class Validator {
*/
protected
function
validate_alpha_dash
(
$attribute
,
$value
)
{
return
preg_match
(
'/^([-a-z0-9_-])+$/i'
,
$value
);
return
preg_match
(
'/^([-a-z0-9_-])+$/i'
,
$value
);
}
/**
...
...
@@ -657,7 +657,7 @@ class Validator {
protected
function
validate_before
(
$attribute
,
$value
,
$parameters
)
{
return
(
strtotime
(
$value
)
<
strtotime
(
$parameters
[
0
]));
}
}
/**
* Validate the date is after a given date.
...
...
@@ -670,7 +670,7 @@ class Validator {
protected
function
validate_after
(
$attribute
,
$value
,
$parameters
)
{
return
(
strtotime
(
$value
)
>
strtotime
(
$parameters
[
0
]));
}
}
/**
* Get the proper error message for an attribute and rule.
...
...
@@ -692,7 +692,7 @@ class Validator {
{
return
$this
->
messages
[
$custom
];
}
elseif
(
Lang
::
has
(
$custom
=
"validation.custom.
{
$custom
}
"
,
$this
->
language
))
elseif
(
Lang
::
has
(
$custom
=
"
{
$bundle
}
validation.custom.
{
$custom
}
"
,
$this
->
language
))
{
return
Lang
::
line
(
$custom
)
->
get
(
$this
->
language
);
}
...
...
@@ -753,7 +753,7 @@ class Validator {
$line
=
'string'
;
}
return
Lang
::
line
(
"
{
$bundle
}
validation.
{
$rule
}
.
{
$line
}
"
)
->
get
(
$this
->
language
);
return
Lang
::
line
(
"
{
$bundle
}
validation.
{
$rule
}
.
{
$line
}
"
)
->
get
(
$this
->
language
);
}
/**
...
...
@@ -929,7 +929,7 @@ class Validator {
protected
function
replace_after
(
$message
,
$attribute
,
$rule
,
$parameters
)
{
return
str_replace
(
':date'
,
$parameters
[
0
],
$message
);
}
}
/**
* Get the displayable name for a given attribute.
...
...
@@ -988,7 +988,7 @@ class Validator {
{
$parameters
=
array
();
// The format for specifying validation rules and parameters follows a
// The format for specifying validation rules and parameters follows a
// {rule}:{parameters} formatting convention. For instance, the rule
// "max:3" specifies that the value may only be 3 characters long.
if
((
$colon
=
strpos
(
$rule
,
':'
))
!==
false
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment