Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Taylor Otwell 2012-05-03 08:33:04 -05:00
parent 295c3b80c2 11f08fb737
commit 5fa78819eb
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/bundle.php
View File

@ -64,7 +64,7 @@ public static function register($bundle, $config = array())
static::$bundles[$bundle] = array_merge($defaults, $config); 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 // directly on the bundle registration. This provides a convenient
// way to register mappings withuot a bootstrap. // way to register mappings withuot a bootstrap.
if (isset($config['autoloads'])) if (isset($config['autoloads']))

2
laravel/core.php
View File

@ -210,7 +210,7 @@
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Finally we will register all of the bundles that have been defined for | 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. | so that they may be started by the developer at any time.
| |
*/ */

4
laravel/file.php
View File

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

12
laravel/input.php
View File

@ -197,6 +197,18 @@ public static function file($key = null, $default = null)
return array_get($_FILES, $key, $default); 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. * Move an uploaded file to permanent storage.
* *