From d1e37fb0c8f6a5f768bd6cacfcce6c338b4c3831 Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Sat, 3 Aug 2013 13:07:28 +0200 Subject: Populate global variable JSINFO also in the Media Manager popup --- lib/exe/mediamanager.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/exe/mediamanager.php') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 66e5ddc82..7cd91fe8f 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -29,12 +29,13 @@ $IMG = null; } - global $INFO; + global $INFO, $JSINFO; $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo(); + $JSINFO = array('id' => $ID, 'namespace' => $NS); $AUTH = $INFO['perm']; // shortcut for historical reasons - trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); - session_write_close(); //close session + trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); + session_write_close(); //close session // do not display the manager if user does not have read access if($AUTH < AUTH_READ && !$fullscreen) { -- cgit v1.2.3 From a5365cbe15702d1211b52128cb0bec6473ba15cc Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Sat, 3 Aug 2013 15:24:42 +0200 Subject: JSINFO in Media Manager: Initialize with empty array, as $ID and $NS aren't useful and available. This is just for adding more values in e. g. an action plugin. --- lib/exe/mediamanager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/exe/mediamanager.php') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 7cd91fe8f..d9e4a6b04 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -31,7 +31,7 @@ global $INFO, $JSINFO; $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo(); - $JSINFO = array('id' => $ID, 'namespace' => $NS); + $JSINFO = array('id' => '', 'namespace' => ''); $AUTH = $INFO['perm']; // shortcut for historical reasons trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); -- cgit v1.2.3 From ab4d3f3b70150d4b7c2622bd5fa6079c49b8d32f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 16:36:56 +0200 Subject: fix expression passed by reference --- lib/exe/mediamanager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/exe/mediamanager.php') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index d9e4a6b04..d94a24c74 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 -- cgit v1.2.3