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
d2f35900
Commit
d2f35900
authored
Apr 01, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix where in shortcut and response header casing problem.
parent
b72f4e9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
laravel/database/query/grammars/grammar.php
+7
-5
laravel/response.php
+1
-1
No files found.
laravel/database/query/grammars/grammar.php
View file @
d2f35900
...
...
@@ -397,22 +397,24 @@ class Grammar extends \Laravel\Database\Grammar {
* @param array $bindings
* @return string
*/
public
function
shortcut
(
$sql
,
$bindings
)
public
function
shortcut
(
$sql
,
&
$bindings
)
{
// Laravel provides an easy short-cut notation for writing raw WHERE IN
// statements. If (...) is in the query, it will be replaced with the
// correct number of parameters based on the bindings.
// correct number of parameters based on the
query
bindings.
if
(
strpos
(
$sql
,
'(...)'
)
!==
false
)
{
for
(
$i
=
0
;
$i
<
count
(
$bindings
);
$i
++
)
{
// If the binding is an array, we can just assume it's used to
//
fill a "where in" condition, so we will just replace the
//
next place-holder in the query with the constraint
.
// If the binding is an array, we can just assume it's used to
fill a
//
where in condition, so we'll just replace the next place-holder
//
in the query with the constraint and splice the bindings
.
if
(
is_array
(
$bindings
[
$i
]))
{
$parameters
=
$this
->
parameterize
(
$bindings
[
$i
]);
array_splice
(
$bindings
,
$i
,
1
,
$bindings
[
$i
]);
$sql
=
preg_replace
(
'~\(\.\.\.\)~'
,
"(
{
$parameters
}
)"
,
$sql
,
1
);
}
}
...
...
laravel/response.php
View file @
d2f35900
...
...
@@ -89,7 +89,7 @@ class Response {
{
$this
->
status
=
$status
;
$this
->
content
=
$content
;
$this
->
headers
=
$headers
;
$this
->
headers
=
array_change_key_case
(
$headers
)
;
}
/**
...
...
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