diff options
| author | Michael Hamann <michael@content-space.de> | 2011-09-08 11:27:42 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-09-08 11:39:00 +0200 |
| commit | fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196 (patch) | |
| tree | b89b580659168d8550dcca66fb0c303389b77aaf /inc/init.php | |
| parent | aea34b5fe445064477d8ad0c98926db33a0d0851 (diff) | |
| parent | cc2c0b9d6af82732ed79eeb85c22b7c3192a4e55 (diff) | |
| download | rpg-fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196.tar.gz rpg-fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196.tar.bz2 | |
Merge branch 'media-revisions'
This introduces a new media manager and media revisions to DokuWiki. The
changes have been implemented by Kate Arzamastseva and are the
result of a Google Summer of Code project, the official project page can
be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/kate/18001
Thanks to Kate for the work and Google for sponsoring it!
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/init.php b/inc/init.php index dfa25f8b1..b3acf2e33 100644 --- a/inc/init.php +++ b/inc/init.php @@ -231,7 +231,9 @@ function init_paths(){ $paths = array('datadir' => 'pages', 'olddir' => 'attic', 'mediadir' => 'media', + 'mediaolddir' => 'media_attic', 'metadir' => 'meta', + 'mediametadir' => 'media_meta', 'cachedir' => 'cache', 'indexdir' => 'index', 'lockdir' => 'locks', |