Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Taylor Otwell 2013-03-28 15:50:36 -05:00
parent 15414808a1 dd7c317707
commit 4125438391
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/auth/drivers/driver.php
View File

@ -215,7 +215,7 @@ protected function token()
*/
protected function recaller()
{
return $this->name().'_remember';
return Config::get('auth.cookie', $this->name().'_remember');
}
/**
@ -228,4 +228,4 @@ protected function name()
return strtolower(str_replace('\\', '_', get_class($this)));
}
}
}

4
laravel/profiling/profiler.php
View File

@ -146,9 +146,9 @@ public static function query($sql, $bindings, $time)
foreach ($bindings as $binding)
{
$binding = Database::escape($binding);
$sql = preg_replace('/\?/', $binding, $sql, 1);
$sql = htmlspecialchars($sql);
$sql = htmlspecialchars($sql, ENT_QUOTES, 'UTF-8', false);
}
static::$data['queries'][] = array($sql, $time);