From 3ca284f9e37aa4720d04cd21207e67aec60f6627 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 12 Nov 2007 19:33:06 +0000 Subject: [PATCH] Eliminate warnings in convert_smilies. Props tellyworth. fixes #5340 git-svn-id: http://svn.automattic.com/wordpress/trunk@6331 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/formatting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index ae38869994..b7b9a67bb5 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -664,7 +664,7 @@ function wp_rel_nofollow_callback( $matches ) { function convert_smilies($text) { global $wp_smiliessearch, $wp_smiliesreplace; $output = ''; - if (get_option('use_smilies')) { + if ( get_option('use_smilies') && !empty($wp_smiliessearch) && !empty($wp_smiliesreplace) ) { // HTML loop taken from texturize function, could possible be consolidated $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between $stop = count($textarr);// loop stuff