Browse Source

Merge branch 'develop' of github.com:laravel/laravel into develop

Taylor Otwell 12 years ago
parent
commit
5fa78819eb
4 changed files with 16 additions and 4 deletions
  1. 1 1
      laravel/bundle.php
  2. 1 1
      laravel/core.php
  3. 2 2
      laravel/file.php
  4. 12 0
      laravel/input.php

+ 1 - 1
laravel/bundle.php

@@ -64,7 +64,7 @@ class Bundle {
 
 		static::$bundles[$bundle] = array_merge($defaults, $config);
 
-		// It is possible for the develoepr to specify auto-loader mappings
+		// It is possible for the developer to specify auto-loader mappings
 		// directly on the bundle registration. This provides a convenient
 		// way to register mappings withuot a bootstrap.
 		if (isset($config['autoloads']))

+ 1 - 1
laravel/core.php

@@ -210,7 +210,7 @@ if (defined('STDIN'))
 |--------------------------------------------------------------------------
 |
 | Finally we will register all of the bundles that have been defined for
-| the application. None of them will be started, yet but will be setup
+| the application. None of them will be started yet, but will be setup
 | so that they may be started by the developer at any time.
 |
 */

+ 2 - 2
laravel/file.php

@@ -61,11 +61,11 @@ class File {
 	 * Delete a file.
 	 *
 	 * @param  string  $path
-	 * @return void
+	 * @return bool
 	 */
 	public static function delete($path)
 	{
-		if (static::exists($path)) @unlink($path);
+		if (static::exists($path)) return @unlink($path);
 	}
 
 	/**

+ 12 - 0
laravel/input.php

@@ -197,6 +197,18 @@ class Input {
 		return array_get($_FILES, $key, $default);
 	}
 
+	/**
+	 * Determine if the uploaded data contains a file.
+	 *
+	 * @param  string  $key
+	 * @return bool
+	 */
+	public static function has_file($key)
+	{
+		$file = static::file($key);
+		return ! empty($file['tmp_name']);
+	}
+	
 	/**
 	 * Move an uploaded file to permanent storage.
 	 *