Skip to content

S
syncEnrollments
Commit 41254383 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge branch 'master' of github.com:laravel/laravel

parents 15414808 dd7c3177
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
laravel/auth/drivers/driver.php
View file @ 41254383
...@@ -215,7 +215,7 @@ abstract class Driver { ...@@ -215,7 +215,7 @@ abstract class Driver {
*/ */
protected function recaller() protected function recaller()
{ {
return $this->name().'_remember'; return Config::get('auth.cookie', $this->name().'_remember');
} }
/** /**
......
laravel/profiling/profiler.php
View file @ 41254383
...@@ -148,7 +148,7 @@ class Profiler { ...@@ -148,7 +148,7 @@ class Profiler {
$binding = Database::escape($binding); $binding = Database::escape($binding);
$sql = preg_replace('/\?/', $binding, $sql, 1); $sql = preg_replace('/\?/', $binding, $sql, 1);
$sql = htmlspecialchars($sql); $sql = htmlspecialchars($sql, ENT_QUOTES, 'UTF-8', false);
} }
static::$data['queries'][] = array($sql, $time); static::$data['queries'][] = array($sql, $time);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment