diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-08-03 08:45:45 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-08-03 08:45:45 -0700 |
| commit | da616cb12d66e3f56b9d0d2a93705cf43c1eab00 (patch) | |
| tree | cdf9d4f6d318da9f1d7c8f611586dda318b7505f /lib | |
| parent | 2ab4be2bed1b819f88d02a2ff2e352432bb13fd7 (diff) | |
| parent | a5365cbe15702d1211b52128cb0bec6473ba15cc (diff) | |
| download | rpg-da616cb12d66e3f56b9d0d2a93705cf43c1eab00.tar.gz rpg-da616cb12d66e3f56b9d0d2a93705cf43c1eab00.tar.bz2 | |
Merge pull request #260 from lupo49/master
Populate global variable JSINFO also in the Media Manager popup / Replaces \r\n with \n
Diffstat (limited to 'lib')
| -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 66e5ddc82..d9e4a6b04 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' => '', 'namespace' => ''); $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) { |