diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-02-25 14:50:59 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-02-25 14:50:59 +0000 |
| commit | 1fe0882c56ea31e738540e942b743966927415fd (patch) | |
| tree | c3324566ada64f09775b35bc989592c7701c32d4 /install.php | |
| parent | 177daee5492e8c3cdfdb950cdf61a6798f7a9586 (diff) | |
| parent | 058fd09655df42c72f3c447e3b9561e4909e978d (diff) | |
| download | rpg-1fe0882c56ea31e738540e942b743966927415fd.tar.gz rpg-1fe0882c56ea31e738540e942b743966927415fd.tar.bz2 | |
Merge branch 'master' into FS#2415
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/install.php b/install.php index f54c25207..2db25bd2f 100644 --- a/install.php +++ b/install.php @@ -54,7 +54,8 @@ $dokuwiki_hash = array( '2011-05-25' => '4241865472edb6fa14a1227721008072', '2011-11-10' => 'b46ff19a7587966ac4df61cbab1b8b31', '2012-01-25' => '72c083c73608fc43c586901fd5dabb74', - '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3' + '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3', + 'devel' => '7b62b75245f57f122d3e0f8ed7989623', ); @@ -391,6 +392,24 @@ EOT; @touch(DOKU_INC.'data/cache/autosubmit.txt'); } + // disable auth plugins til needed + $output = <<<EOT +<?php +/* + * Local plugin enable/disable settings + * + * Auto-generated by install script + * Date: $now + */ + +\$plugins['authad'] = 0; +\$plugins['authldap'] = 0; +\$plugins['authmysql'] = 0; +\$plugins['authpgsql'] = 0; + +EOT; + $ok = $ok && fileWrite(DOKU_LOCAL.'plugins.local.php', $output); + return $ok; } |