diff options
| author | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
| commit | 762b4c44c691f69d521413d7016314e7f547c102 (patch) | |
| tree | 95ab294b1df2f8c7a5efb56762a0f284bec3754e /inc/media.php | |
| parent | eae17177de8f3f3580af5ea66d126aee0f23227f (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.gz rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.bz2 | |
Merge remote branch 'origin/master' into sitemap
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 =''; } |