diff options
| author | Adrian Lang <mail@adrianlang.de> | 2010-10-07 09:44:02 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2010-10-07 09:44:02 +0200 |
| commit | d9c8ae6b7379d7b64d4817dbd5cca276b45a9dd5 (patch) | |
| tree | 39c26d5412170ca4fa176962e60e9962dc643667 /inc/media.php | |
| parent | 2c053ed58376c6709596ab48fc40dceb90d4e89d (diff) | |
| parent | 85dd53ceb1c2d9a7abe01b5ec50d155dcb142c59 (diff) | |
| download | rpg-d9c8ae6b7379d7b64d4817dbd5cca276b45a9dd5.tar.gz rpg-d9c8ae6b7379d7b64d4817dbd5cca276b45a9dd5.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/media.php b/inc/media.php index 668f42d6a..3dacd12b7 100644 --- a/inc/media.php +++ b/inc/media.php @@ -391,6 +391,7 @@ function media_contentcheck($file,$mime){ function media_notify($id,$file,$mime){ global $lang; global $conf; + global $INFO; if(empty($conf['notify'])) return; //notify enabled? $ip = clientIP(); @@ -729,6 +730,7 @@ function media_nstree($ns){ // currently selected namespace $ns = cleanID($ns); if(empty($ns)){ + global $ID; $ns = dirname(str_replace(':','/',$ID)); if($ns == '.') $ns =''; } |