fixing conflicts.

artisan

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.8
+ * @version  3.1.9
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

laravel/documentation/changes.md

@@ -2,8 +2,13 @@ # Laravel Change Log
 
 ## Contents
 
+<<<<<<< HEAD:laravel/documentation/changes.md
 - [Laravel 3.2](#3.2)
 - [Upgrading From 3.1](#upgrade-3.2)
+=======
+- [Laravel 3.1.9](#3.1.9)
+- [Upgrading From 3.1.8](#upgrade-3.1.9)
+>>>>>>> master:changes.md
 - [Laravel 3.1.8](#3.1.8)
 - [Upgrading From 3.1.7](#upgrade-3.1.8)
 - [Laravel 3.1.7](#3.1.7)
@@ -62,6 +67,16 @@ ## Upgrading From 3.1
 
 - Replace the **laravel** folder.
 
+<a name="3.1.9"></a>
+## Laravel 3.1.9
+
+- Fixes cookie session driver bug that caused infinite loop on some occasions.
+
+<a name="upgrade-3.1.9"></a>
+## Upgrading From 3.1.8
+
+- Replace the **laravel** folder.
+
 <a name="3.1.8"></a>
 ## Laravel 3.1.8
 

laravel/html.php

@@ -62,7 +62,7 @@ public static function decode($value)
 	 */
 	public static function script($url, $attributes = array())
 	{
-		$url = static::entities(URL::to_asset($url));
+		$url = urlencode(URL::to_asset($url));
 
 		return '<script src="'.$url.'"'.static::attributes($attributes).'></script>'.PHP_EOL;
 	}
@@ -90,7 +90,7 @@ public static function style($url, $attributes = array())
 
 		$attributes = $attributes + $defaults;
 
-		$url = static::entities(URL::to_asset($url));
+		$url = urlencode(URL::to_asset($url));
 
 		return '<link href="'.$url.'"'.static::attributes($attributes).'>'.PHP_EOL;
 	}
@@ -126,7 +126,7 @@ public static function span($value, $attributes = array())
 	 */
 	public static function link($url, $title, $attributes = array(), $https = false)
 	{
-		$url = static::entities(URL::to($url, $https));
+		$url = urlencode(URL::to($url, $https));
 
 		return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
 	}
@@ -157,7 +157,7 @@ public static function link_to_secure($url, $title, $attributes = array())
 	 */
 	public static function link_to_asset($url, $title, $attributes = array(), $https = null)
 	{
-		$url = static::entities(URL::to_asset($url, $https));
+		$url = urlencode(URL::to_asset($url, $https));
 
 		return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
 	}
@@ -267,7 +267,7 @@ public static function image($url, $alt = '', $attributes = array())
 	{
 		$attributes['alt'] = $alt;
 
-		return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
+		return '<img src="'.urlencode(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
 	}
 
 	/**

laravel/session/drivers/driver.php

@@ -55,6 +55,14 @@ public function id()
 	{
 		$session = array();
 
+		// If the driver is an instance of the Cookie driver, we are able to
+		// just return any string since the Cookie driver has no real idea
+		// of a server side persisted session with an ID.
+		if ($this instanceof Cookie)
+		{
+			return Str::random(40);
+		}
+
 		// We'll containue generating random IDs until we find an ID that is
 		// not currently assigned to a session. This is almost definitely
 		// going to happen on the first iteration.

paths.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.8
+ * @version  3.1.9
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

public/index.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.8
+ * @version  3.1.9
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */