Merge pull request #776 from JesseObrien/develop

Request::ip() doesn't return default

Merge pull request #776 from JesseObrien/develop
Request::ip() doesn't return default
81efdcf1 · Taylor Otwell · 6405175d · 67ac2f2f · 81efdcf1
Commit 81efdcf1 authored Jun 20, 2012 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

laravel/request.php
+2 -1

No files found.
--- a/laravel/request.php
+++ b/laravel/request.php
@@ -102,7 +102,8 @@ class Request {
 	 */
 	public static function ip($default = '0.0.0.0')
 	{
-		return value(static::foundation()->getClientIp(), $default);
+		$client_ip = static::foundation()->getClientIp();
+		return $client_ip === NULL ? $default : $client_ip;
 	}

 	/**