1 --- dokuwiki/inc/init.php~ 2009-11-10 15:19:36.000000000 +0200
2 +++ dokuwiki/inc/init.php 2009-11-10 15:19:38.080947917 +0200
4 if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
6 // define config path (packagers may want to change this to /etc/dokuwiki/)
7 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
8 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
10 +// define path where variable data is saved (packagers may want to change this to /var/lib/dokuwiki/)
11 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
13 // check for error reporting override or set error reporting to sane values
14 if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
15 --- dokuwiki-2012-01-25/install.php~ 2012-01-27 09:30:05.000000000 +0200
16 +++ dokuwiki-2012-01-25/install.php 2012-01-27 09:31:55.795792191 +0200
20 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
21 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
22 -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
23 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
24 +if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF);
25 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
27 // check for error reporting override or set error reporting to sane values
28 if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
33 - 'data' => DOKU_INC.'data',
34 - 'pages' => DOKU_INC.'data/pages',
35 - 'attic' => DOKU_INC.'data/attic',
36 - 'media' => DOKU_INC.'data/media',
37 - 'media_attic' => DOKU_INC.'data/media_attic',
38 - 'media_meta' => DOKU_INC.'data/media_meta',
39 - 'meta' => DOKU_INC.'data/meta',
40 - 'cache' => DOKU_INC.'data/cache',
41 - 'locks' => DOKU_INC.'data/locks',
42 - 'index' => DOKU_INC.'data/index',
43 - 'tmp' => DOKU_INC.'data/tmp'
44 + 'data' => DOKU_DATA,
45 + 'pages' => DOKU_DATA.'pages',
46 + 'attic' => DOKU_DATA.'attic',
47 + 'media' => DOKU_DATA.'media',
48 + 'media_attic' => DOKU_DATA.'media_attic',
49 + 'media_meta' => DOKU_DATA.'media_meta',
50 + 'meta' => DOKU_DATA.'meta',
51 + 'cache' => DOKU_DATA.'cache',
52 + 'locks' => DOKU_DATA.'locks',
53 + 'index' => DOKU_DATA.'index',
54 + 'tmp' => DOKU_DATA.'tmp'