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
1ac911f0
Commit
1ac911f0
authored
Jun 03, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:laravel/laravel into develop
parents
4dd82a0d
0bdfea32
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
laravel/blade.php
+1
-1
laravel/database/schema/grammars/sqlserver.php
+1
-1
laravel/ioc.php
+1
-1
No files found.
laravel/blade.php
View file @
1ac911f0
...
...
@@ -53,7 +53,7 @@ class Blade {
return
;
}
$compiled
=
path
(
'storage'
)
.
'views/'
.
md5
(
$view
->
path
);
$compiled
=
Blade
::
compiled
(
$view
->
path
);
// If the view doesn't exist or has been modified since the last time it
// was compiled, we will recompile the view into pure PHP from it's
...
...
laravel/database/schema/grammars/sqlserver.php
View file @
1ac911f0
...
...
@@ -138,7 +138,7 @@ class SQLServer extends Grammar {
{
$name
=
$command
->
name
;
$columns
=
$this
->
columnize
(
$command
->
$
columns
);
$columns
=
$this
->
columnize
(
$command
->
columns
);
return
'ALTER TABLE '
.
$this
->
wrap
(
$table
)
.
" ADD CONSTRAINT
{
$name
}
PRIMARY KEY (
{
$columns
}
)"
;
}
...
...
laravel/ioc.php
View file @
1ac911f0
...
...
@@ -114,7 +114,7 @@ class IoC {
// its nested dependencies recursively until they are each resolved.
if
(
$concrete
==
$type
or
$concrete
instanceof
Closure
)
{
$object
=
static
::
build
(
$concrete
);
$object
=
static
::
build
(
$concrete
,
$parameters
);
}
else
{
...
...
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