Merge pull request #776 from JesseObrien/develop

Request::ip() doesn't return default
2012-06-20 09:56:01 -07:00 · 2012-06-20 09:56:01 -07:00 · 81efdcf157
parent 6405175dbd 67ac2f2f9a
commit 81efdcf157
1 changed files with 2 additions and 1 deletions
--- a/laravel/request.php
+++ b/laravel/request.php
@ -102,7 +102,8 @@ public static function spoofed()
 	 */
 	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;
 	}

 	/**