From 009b26427132ff227d045a72c870aa473bd020d2 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 25 Jul 2011 13:20:07 +0000
Subject: [PATCH] Make [18456] more obvious. Fixes #16432.

git-svn-id: http://svn.automattic.com/wordpress/trunk@18465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 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(