Browse Source

check application.ssl in request::secure.

Taylor Otwell 12 years ago
parent
commit
222383c83b
2 changed files with 7 additions and 6 deletions
  1. 6 5
      laravel/documentation/changes.md
  2. 1 1
      laravel/request.php

+ 6 - 5
laravel/documentation/changes.md

@@ -30,14 +30,15 @@
 - [Added `save` method to has\_many Eloquent relationship](/docs/database/eloquent#has-many-save).
 - [Added `unless` structure to Blade template engine](/docs/views/templating#blade-unless).
 - Migrated to the Symfony HttpFoundation component for core request / response handling.
-- Fixed the passing of strings into the Input::except method.
-- Fixed replacement of optional parameters in URL::transpose method.
-- Improved "update" handling on Has_Many and Has_One relationships.
+- Fixed the passing of strings into the `Input::except` method.
+- Fixed replacement of optional parameters in `URL::transpose` method.
+- Improved `update` handling on `Has_Many` and `Has_One` relationships.
 - Improved View performance by only loading contents from file once.
-- Fix handling of URLs beginning with has in URL::to.
+- Fix handling of URLs beginning with has in `URL::to`.
 - Fix the resolution of unset Eloquent attributes.
 - Allows pivot table timestamps to be disabled.
-- Made the "get_timestamp" Eloquent method static.
+- Made the `get_timestamp` Eloquent method static.
+- `Request::secure` now takes `application.ssl` configuration option into consideration.
 
 <a name="upgrade-3.2"></a>
 ## Upgrading From 3.1

+ 1 - 1
laravel/request.php

@@ -142,7 +142,7 @@ class Request {
 	 */
 	public static function secure()
 	{
-		return static::foundation()->isSecure();
+		return static::foundation()->isSecure() and Config::get('application.ssl');
 	}
 
 	/**