diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-03-03 18:30:48 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-03-03 18:30:48 +0000 |
| commit | ca22711e6b0caa2525d6134c28bf0af78e8fcda3 (patch) | |
| tree | dd8afa7a6dfa06a9e02803a14570af8380068d8d /lib/exe/mediamanager.php | |
| parent | 5ba389b2134d71e9b0a8b78a465bb4e8849ab664 (diff) | |
| download | rpg-ca22711e6b0caa2525d6134c28bf0af78e8fcda3.tar.gz rpg-ca22711e6b0caa2525d6134c28bf0af78e8fcda3.tar.bz2 | |
make global, ensure created in mediamanager is global and merged with any pre-existing
Diffstat (limited to 'lib/exe/mediamanager.php')
| -rw-r--r-- | lib/exe/mediamanager.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index a205c4570..3ec749cd8 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -12,6 +12,7 @@ if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); + global $DEL; // get namespace to display (either direct or from deletion order) if($INPUT->str('delete')){ $DEL = cleanID($INPUT->str('delete')); @@ -28,7 +29,8 @@ $IMG = null; } - $INFO = mediainfo(); + global $INFO; + $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo(); $AUTH = $INFO['perm']; // shortcut for historical reasons trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
|