Browse Source

Merge branch 'develop' of github.com:laravel/laravel into develop

Dayle Rees 12 years ago
parent
commit
0556ef35ce
3 changed files with 22 additions and 7 deletions
  1. 9 7
      laravel/html.php
  2. 3 0
      laravel/profiling/profiler.php
  3. 10 0
      laravel/request.php

+ 9 - 7
laravel/html.php

@@ -137,10 +137,12 @@ class HTML {
 	 * @param  bool    $https
 	 * @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);
 
+		if (is_null($title)) $title = $url;
+
 		return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
 	}
 
@@ -152,7 +154,7 @@ class HTML {
 	 * @param  array   $attributes
 	 * @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);
 	}
@@ -168,7 +170,7 @@ class HTML {
 	 * @param  bool    $https
 	 * @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);
 
@@ -183,7 +185,7 @@ class HTML {
 	 * @param  array   $attributes
 	 * @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);
 	}
@@ -207,7 +209,7 @@ class HTML {
 	 * @param  array   $attributes
 	 * @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);
 	}
@@ -231,7 +233,7 @@ class HTML {
 	 * @param  array   $attributes
 	 * @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);
 	}
@@ -418,7 +420,7 @@ class HTML {
 	    {
 	        return call_user_func_array(static::$macros[$method], $parameters);
 	    }
-	    
+
 	    throw new \Exception("Method [$method] does not exist.");
 	}
 

+ 3 - 0
laravel/profiling/profiler.php

@@ -5,6 +5,7 @@ use Laravel\File;
 use Laravel\Event;
 use Laravel\Config;
 use Laravel\Request;
+use Laravel\Database;
 
 class Profiler {
 
@@ -57,6 +58,8 @@ class Profiler {
 	{
 		foreach ($bindings as $binding)
 		{
+			$binding = Database::connection()->pdo->quote($binding);
+
 			$sql = preg_replace('/\?/', $binding, $sql, 1);
 		}
 

+ 10 - 0
laravel/request.php

@@ -177,6 +177,16 @@ class Request {
 	{
 		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.