diff options
author | Christopher Smith <chris@jalakai.co.uk> | 2015-05-17 12:56:51 +0200 |
---|---|---|
committer | Christopher Smith <chris@jalakai.co.uk> | 2015-05-17 12:56:51 +0200 |
commit | 45ae4bb83834a513e709b960747f964dba90392b (patch) | |
tree | 9ddc2f64f15816d93b03db07263a58d969294bd6 /inc/confutils.php | |
parent | 1f3b9c4577b0d0fa91c26b01caab84ab3f20e1e4 (diff) | |
download | rpg-45ae4bb83834a513e709b960747f964dba90392b.tar.gz rpg-45ae4bb83834a513e709b960747f964dba90392b.tar.bz2 |
Add filtering to remove blank entries from key/value config retrieval
This applies to:
- acronyms
- entities
- interwiki
- mime
- smileys
Diffstat (limited to 'inc/confutils.php')
-rw-r--r-- | inc/confutils.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/inc/confutils.php b/inc/confutils.php index 8643a056c..3e69b20be 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -49,6 +49,7 @@ function getMimeTypes() { static $mime = null; if ( !$mime ) { $mime = retrieveConfig('mime','confToHash'); + $mime = array_filter($mime); } return $mime; } @@ -62,6 +63,7 @@ function getAcronyms() { static $acronyms = null; if ( !$acronyms ) { $acronyms = retrieveConfig('acronyms','confToHash'); + $acronyms = array_filter($acronyms); } return $acronyms; } @@ -75,6 +77,7 @@ function getSmileys() { static $smileys = null; if ( !$smileys ) { $smileys = retrieveConfig('smileys','confToHash'); + $smileys = array_filter($smileys); } return $smileys; } @@ -88,6 +91,7 @@ function getEntities() { static $entities = null; if ( !$entities ) { $entities = retrieveConfig('entities','confToHash'); + $entities = array_filter($entities); } return $entities; } @@ -101,9 +105,11 @@ function getInterwiki() { static $wikis = null; if ( !$wikis ) { $wikis = retrieveConfig('interwiki','confToHash',array(true)); + $wikis = array_filter($wikis); + + //add sepecial case 'this' + $wikis['this'] = DOKU_URL.'{NAME}'; } - //add sepecial case 'this' - $wikis['this'] = DOKU_URL.'{NAME}'; return $wikis; } |