From ca22711e6b0caa2525d6134c28bf0af78e8fcda3 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 3 Mar 2013 18:30:48 +0000
Subject: make  global, ensure  created in mediamanager is global and merged
 with any pre-existing

---
 lib/exe/mediamanager.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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());
-- 
cgit v1.2.3