diff options
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; } |