summaryrefslogtreecommitdiff
path: root/inc/io.php
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-02-23 22:07:26 +0100
committerGerrit Uitslag <klapinklapin@gmail.com>2014-02-23 22:07:26 +0100
commit8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (patch)
tree928fc44fde692835bca9dd304ebcb17cdd710ac8 /inc/io.php
parent4d5954c8d1f8bcc5450f8cf70d8139cf5a1e697d (diff)
parent5d873dd4ce31c79403a01ac0e40ff148be282592 (diff)
downloadrpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.gz
rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.bz2
Merge remote-tracking branch 'origin/master' into diff_navigation
Conflicts: inc/html.php
Diffstat (limited to 'inc/io.php')
-rw-r--r--inc/io.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/io.php b/inc/io.php
index c5225a2e0..27a34b045 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -367,8 +367,6 @@ function io_createNamespace($id, $ns_type='pages') {
* @author Andreas Gohr <andi@splitbrain.org>
*/
function io_makeFileDir($file){
- global $conf;
-
$dir = dirname($file);
if(!@is_dir($dir)){
io_mkdir_p($dir) || msg("Creating directory $dir failed",-1);