Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
syncEnrollments
Project
Project
Details
Activity
Releases
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yeray Santana Hualde
syncEnrollments
Commits
0556ef35
Commit
0556ef35
authored
Jul 31, 2012
by
Dayle Rees
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:laravel/laravel into develop
parents
30175c2a
dab2c792
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
7 deletions
+22
-7
html.php
laravel/html.php
+9
-7
profiler.php
laravel/profiling/profiler.php
+3
-0
request.php
laravel/request.php
+10
-0
No files found.
laravel/html.php
View file @
0556ef35
...
@@ -137,10 +137,12 @@ class HTML {
...
@@ -137,10 +137,12 @@ class HTML {
* @param bool $https
* @param bool $https
* @return string
* @return string
*/
*/
public
static
function
link
(
$url
,
$title
,
$attributes
=
array
(),
$https
=
null
)
public
static
function
link
(
$url
,
$title
=
null
,
$attributes
=
array
(),
$https
=
null
)
{
{
$url
=
URL
::
to
(
$url
,
$https
);
$url
=
URL
::
to
(
$url
,
$https
);
if
(
is_null
(
$title
))
$title
=
$url
;
return
'<a href="'
.
$url
.
'"'
.
static
::
attributes
(
$attributes
)
.
'>'
.
static
::
entities
(
$title
)
.
'</a>'
;
return
'<a href="'
.
$url
.
'"'
.
static
::
attributes
(
$attributes
)
.
'>'
.
static
::
entities
(
$title
)
.
'</a>'
;
}
}
...
@@ -152,7 +154,7 @@ class HTML {
...
@@ -152,7 +154,7 @@ class HTML {
* @param array $attributes
* @param array $attributes
* @return string
* @return string
*/
*/
public
static
function
link_to_secure
(
$url
,
$title
,
$attributes
=
array
())
public
static
function
link_to_secure
(
$url
,
$title
=
null
,
$attributes
=
array
())
{
{
return
static
::
link
(
$url
,
$title
,
$attributes
,
true
);
return
static
::
link
(
$url
,
$title
,
$attributes
,
true
);
}
}
...
@@ -168,7 +170,7 @@ class HTML {
...
@@ -168,7 +170,7 @@ class HTML {
* @param bool $https
* @param bool $https
* @return string
* @return string
*/
*/
public
static
function
link_to_asset
(
$url
,
$title
,
$attributes
=
array
(),
$https
=
null
)
public
static
function
link_to_asset
(
$url
,
$title
=
null
,
$attributes
=
array
(),
$https
=
null
)
{
{
$url
=
URL
::
to_asset
(
$url
,
$https
);
$url
=
URL
::
to_asset
(
$url
,
$https
);
...
@@ -183,7 +185,7 @@ class HTML {
...
@@ -183,7 +185,7 @@ class HTML {
* @param array $attributes
* @param array $attributes
* @return string
* @return string
*/
*/
public
static
function
link_to_secure_asset
(
$url
,
$title
,
$attributes
=
array
())
public
static
function
link_to_secure_asset
(
$url
,
$title
=
null
,
$attributes
=
array
())
{
{
return
static
::
link_to_asset
(
$url
,
$title
,
$attributes
,
true
);
return
static
::
link_to_asset
(
$url
,
$title
,
$attributes
,
true
);
}
}
...
@@ -207,7 +209,7 @@ class HTML {
...
@@ -207,7 +209,7 @@ class HTML {
* @param array $attributes
* @param array $attributes
* @return string
* @return string
*/
*/
public
static
function
link_to_route
(
$name
,
$title
,
$parameters
=
array
(),
$attributes
=
array
())
public
static
function
link_to_route
(
$name
,
$title
=
null
,
$parameters
=
array
(),
$attributes
=
array
())
{
{
return
static
::
link
(
URL
::
to_route
(
$name
,
$parameters
),
$title
,
$attributes
);
return
static
::
link
(
URL
::
to_route
(
$name
,
$parameters
),
$title
,
$attributes
);
}
}
...
@@ -231,7 +233,7 @@ class HTML {
...
@@ -231,7 +233,7 @@ class HTML {
* @param array $attributes
* @param array $attributes
* @return string
* @return string
*/
*/
public
static
function
link_to_action
(
$action
,
$title
,
$parameters
=
array
(),
$attributes
=
array
())
public
static
function
link_to_action
(
$action
,
$title
=
null
,
$parameters
=
array
(),
$attributes
=
array
())
{
{
return
static
::
link
(
URL
::
to_action
(
$action
,
$parameters
),
$title
,
$attributes
);
return
static
::
link
(
URL
::
to_action
(
$action
,
$parameters
),
$title
,
$attributes
);
}
}
...
...
laravel/profiling/profiler.php
View file @
0556ef35
...
@@ -5,6 +5,7 @@ use Laravel\File;
...
@@ -5,6 +5,7 @@ use Laravel\File;
use
Laravel\Event
;
use
Laravel\Event
;
use
Laravel\Config
;
use
Laravel\Config
;
use
Laravel\Request
;
use
Laravel\Request
;
use
Laravel\Database
;
class
Profiler
{
class
Profiler
{
...
@@ -57,6 +58,8 @@ class Profiler {
...
@@ -57,6 +58,8 @@ class Profiler {
{
{
foreach
(
$bindings
as
$binding
)
foreach
(
$bindings
as
$binding
)
{
{
$binding
=
Database
::
connection
()
->
pdo
->
quote
(
$binding
);
$sql
=
preg_replace
(
'/\?/'
,
$binding
,
$sql
,
1
);
$sql
=
preg_replace
(
'/\?/'
,
$binding
,
$sql
,
1
);
}
}
...
...
laravel/request.php
View file @
0556ef35
...
@@ -178,6 +178,16 @@ class Request {
...
@@ -178,6 +178,16 @@ class Request {
return
static
::
foundation
()
->
headers
->
get
(
'referer'
);
return
static
::
foundation
()
->
headers
->
get
(
'referer'
);
}
}
/**
* Get the timestamp of the time when the request was started.
*
* @return int
*/
public
static
function
time
()
{
return
(
int
)
LARAVEL_START
;
}
/**
/**
* Determine if the current request is via the command line.
* Determine if the current request is via the command line.
*
*
...
...
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