8000 fixing conflicts. · allforweb/laravel@68834a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 68834a4

Browse files
taylorotwelltaylorotwell
committed
fixing conflicts.
2 parents a994c30 + 8e05530 commit 68834a4

File tree

6 files changed

+31
-8
lines changed

6 files changed

+31
-8
lines changed

‎artisan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Laravel - A PHP Framework For Web Artisans
44
*
55
* @package Laravel
6-
* @version 3.1.8
6+
* @version 3.1.9
77
* @author Taylor Otwell <taylorotwell@gmail.com>
88
* @link http://laravel.com
99
*/

‎laravel/documentation/changes.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
## Contents
44

5+
<<<<<<< HEAD:laravel/documentation/changes.md
56
- [Laravel 3.2](#3.2)
67
- [Upgrading From 3.1](#upgrade-3.2)
8+
=======
9+
- [Laravel 3.1.9](#3.1.9)
10+
- [Upgrading From 3.1.8](#upgrade-3.1.9)
11+
>>>>>>> master:changes.md
712
- [Laravel 3.1.8](#3.1.8)
813
- [Upgrading From 3.1.7](#upgrade-3.1.8)
914
- [Laravel 3.1.7](#3.1.7)
@@ -62,6 +67,16 @@
6267

6368
- Replace the **laravel** folder.
6469

70+
<a name="3.1.9"></a>
71+
## Laravel 3.1.9
72+
73+
- Fixes cookie session driver bug that caused infinite loop on some occasions.
74+
75+
<a name="upgrade-3.1.9"></a>
76+
## Upgrading From 3.1.8
77+
78+
- Replace the **laravel** folder.
79+
6580
<a name="3.1.8"></a>
6681
## Laravel 3.1.8
6782

‎laravel/html.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function decode($value)
6262
*/
6363
public static function script($url, $attributes = array())
6464
{
65-
$url = static::entities(URL::to_asset($url));
65+
$url = urlencode(URL::to_asset($url));
6666

6767
return '<script src="'.$url.'"'.static::attributes($attributes).'></script>'.PHP_EOL;
6868
}
@@ -90,7 +90,7 @@ public static function style($url, $attributes = array())
9090

9191
$attributes = $attributes + $defaults;
9292

93-
$url = static::entities(URL::to_asset($url));
93+
$url = urlencode(URL::to_asset($url));
9494

9595
return '<link href="'.$url.'"'.static::attributes($attributes).'>'.PHP_EOL;
9696
}
@@ -126,7 +126,7 @@ public static function span($value, $attributes = array())
126126
*/
127127
public static function link($url, $title, $attributes = array(), $https = false)
128128
{
129-
$url = static::entities(URL::to($url, $https));
129+
$url = urlencode(URL::to($url, $https));
130130

131131
return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
132132
}
@@ -157,7 +157,7 @@ public static function link_to_secure($url, $title, $attributes = array())
157157
*/
158158
public static function link_to_asset($url, $title, $attributes = array(), $https = null)
159159
{
160-
$url = static::entities(URL::to_asset($url, $https));
160+
$url = urlencode(URL::to_asset($url, $https));
161161

162162
return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
163163
}
@@ -267,7 +267,7 @@ public static function image($url, $alt = '', $attributes = array())
267267
{
268268
$attributes['alt'] = $alt;
269269

270-
return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
270+
return '<img src="'.urlencode(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
271271
}
272272

273273
/**

‎laravel/session/drivers/driver.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ public function id()
5555
{
5656
$session = array();
5757

58+
// If the driver is an instance of the Cookie driver, we are able to
59+
// just return any string since the Cookie driver has no real idea
60+
// of a server side persisted session with an ID.
61+
if ($this instanceof Cookie)
62+
{
63+
return Str::random(40);
64+
}
65+
5866
// We'll containue generating random IDs until we find an ID that is
5967
// not currently assigned to a session. This is almost definitely
6068
// going to happen on the first iteration.

‎paths.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Laravel - A PHP Framework For Web Artisans
44
*
55
* @pack 9D8F age Laravel
6-
* @version 3.1.8
6+
* @version 3.1.9
77
* @author Taylor Otwell <taylorotwell@gmail.com>
88
* @link http://laravel.com
99
*/

‎public/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Laravel - A PHP Framework For Web Artisans
44
*
55
* @package Laravel
6-
* @version 3.1.8
6+
* @version 3.1.9
77
* @author Taylor Otwell <taylorotwell@gmail.com>
88
* @link http://laravel.com
99
*/

0 commit comments

Comments
 (0)
0