From fe2dc7c083ad991ed310d77d54f2f06134a58dbd Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Mon, 25 Jul 2011 13:20:07 +0000
Subject: [PATCH] Make [18456] more obvious. Fixes #16432.

git-svn-id: https://develop.svn.wordpress.org/trunk@18465 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/formatting.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 311cd5f5eb..b42f5e9e06 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1876,7 +1876,9 @@ function wp_trim_excerpt($text) {
  */
 function ent2ncr($text) {
 
-	if( null !== $filtered = apply_filters( 'pre_ent2ncr', null, $text ) )
+	// Allow a plugin to short-circuit and override the mappings.
+	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
+	if( null !== $filtered )
 		return $filtered;
 
 	$to_ncr = array(