diff options
| author | Steven Danz <steven-danz@kc.rr.com> | 2005-06-28 04:36:28 +0200 |
|---|---|---|
| committer | Steven Danz <steven-danz@kc.rr.com> | 2005-06-28 04:36:28 +0200 |
| commit | d2ee49cef0fd47388b8a1ac8cb259dac5fb8c670 (patch) | |
| tree | 116c6baf2c9b1d22e5503c5d22a4911d440e1cac /inc/confutils.php | |
| parent | 38c08c2be9122c742a3ff6c2815dbc1f515476d1 (diff) | |
| download | rpg-d2ee49cef0fd47388b8a1ac8cb259dac5fb8c670.tar.gz rpg-d2ee49cef0fd47388b8a1ac8cb259dac5fb8c670.tar.bz2 | |
local_acronyms.patch
Add the option of using a local.acronyms.conf file to specify local acronyms
without having to edit the default set
darcs-hash:20050628023628-3ed6d-2740b411efc124671f235ff9ebfc292c7d331709.gz
Diffstat (limited to 'inc/confutils.php')
| -rw-r--r-- | inc/confutils.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/inc/confutils.php b/inc/confutils.php index a0ad322fb..329358f62 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -50,6 +50,10 @@ function getAcronyms() { static $acronyms = NULL; if ( !$acronyms ) { $acronyms = confToHash(DOKU_INC . 'conf/acronyms.conf'); + if (@file_exists(DOKU_INC . 'conf/local.acronyms.conf')) { + $local = confToHash(DOKU_INC . 'conf/local.acronyms.conf'); + $acronyms = array_merge($acronyms, $local); + } } return $acronyms; } |