From f266a91942e3eb7558afe54062c5e6a7bbcdf9ee Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 18 May 2015 20:31:04 +0100
Subject: [PATCH] Ensure filtering only removes empty string values (not other
values which PHP evaluates to false)
---
inc/confutils.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/inc/confutils.php b/inc/confutils.php
index 7d7c043fa..e3805d74e 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -63,7 +63,7 @@ function getAcronyms() {
static $acronyms = null;
if ( !$acronyms ) {
$acronyms = retrieveConfig('acronyms','confToHash');
- $acronyms = array_filter($acronyms);
+ $acronyms = array_filter($acronyms, 'strlen');
}
return $acronyms;
}
@@ -77,7 +77,7 @@ function getSmileys() {
static $smileys = null;
if ( !$smileys ) {
$smileys = retrieveConfig('smileys','confToHash');
- $smileys = array_filter($smileys);
+ $smileys = array_filter($smileys, 'strlen');
}
return $smileys;
}
@@ -91,7 +91,7 @@ function getEntities() {
static $entities = null;
if ( !$entities ) {
$entities = retrieveConfig('entities','confToHash');
- $entities = array_filter($entities);
+ $entities = array_filter($entities, 'strlen');
}
return $entities;
}
@@ -105,7 +105,7 @@ function getInterwiki() {
static $wikis = null;
if ( !$wikis ) {
$wikis = retrieveConfig('interwiki','confToHash',array(true));
- $wikis = array_filter($wikis);
+ $wikis = array_filter($wikis, 'strlen');
//add sepecial case 'this'
$wikis['this'] = DOKU_URL.'{NAME}';
--
GitLab