diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 18:39:11 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 18:39:11 +0000 |
| commit | 4e60057c8ccbee18b94a64208311f9bbb338eec6 (patch) | |
| tree | 08d79159aa78693c27f54ecebc3105034dfc5933 /lib/exe/mediamanager.php | |
| parent | 57a6f99d09d3662a8a2ad72e312aa6f53bcc2d01 (diff) | |
| parent | 069942acdaa5ba825bc3f92c7093b5071789f1ca (diff) | |
| download | rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.gz rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.bz2 | |
Merge branch 'master' into tablethead
Diffstat (limited to 'lib/exe/mediamanager.php')
| -rw-r--r-- | lib/exe/mediamanager.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index d9e4a6b04..7044232ce 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -34,7 +34,8 @@ $JSINFO = array('id' => '', 'namespace' => ''); $AUTH = $INFO['perm']; // shortcut for historical reasons - trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); + $tmp = array(); + trigger_event('MEDIAMANAGER_STARTED', $tmp); session_write_close(); //close session // do not display the manager if user does not have read access @@ -56,7 +57,7 @@ } // give info on PHP caught upload errors - if($_FILES['upload']['error']){ + if(!empty($_FILES['upload']['error'])){ switch($_FILES['upload']['error']){ case 1: case 2: @@ -70,7 +71,7 @@ } // handle upload - if($_FILES['upload']['tmp_name']){ + if(!empty($_FILES['upload']['tmp_name'])){ $JUMPTO = media_upload($NS,$AUTH); if($JUMPTO) $NS = getNS($JUMPTO); } |