diff options
-rw-r--r-- | data/wiki/dokuwiki.txt | 2 | ||||
-rw-r--r-- | inc/init.php | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/wiki/dokuwiki.txt b/data/wiki/dokuwiki.txt index 03079b006..658a08007 100644 --- a/data/wiki/dokuwiki.txt +++ b/data/wiki/dokuwiki.txt @@ -24,7 +24,9 @@ All documentation and additional information besides the [[syntax|syntax descrip * [[doku>wiki:compare|Wiki Engine Comparison]] * [[doku>wiki:experiences|Experiences]] * [[doku>wiki:tips|Tips and Tricks]] + * [[http://bugs.splitbrain.org/index.php?project=1|Bugs and feature wishes]] + * [[doku>wiki:mailinglist|Mailing List]] * [[doku>wiki:todo|ToDo List]] * [[doku>wiki:development|Development Ressources]] diff --git a/inc/init.php b/inc/init.php index 58dc5c67d..346a41baf 100644 --- a/inc/init.php +++ b/inc/init.php @@ -9,6 +9,9 @@ // set up error reporting to sane values error_reporting(E_ALL ^ E_NOTICE); + //prepare config array() + $conf = array(); + // load the config file(s) require_once(DOKU_INC.'conf/dokuwiki.php'); @include_once(DOKU_INC.'conf/local.php'); |