From 45ae4bb83834a513e709b960747f964dba90392b Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 17 May 2015 12:56:51 +0200
Subject: Add filtering to remove blank entries from key/value config retrieval
 This applies to: - acronyms - entities - interwiki - mime - smileys

---
 inc/confutils.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'inc/confutils.php')

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;
 }
 
-- 
cgit v1.2.3