Migration to get_settings and away from globals.

git-svn-id: http://svn.automattic.com/wordpress/trunk@957 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/functions-formatting.php

@@ -317,10 +317,9 @@ function convert_gmcode($content) { // depreciated
 }
 
 function convert_smilies($text) {
-	global $smilies_directory, $use_smilies;
 	global $wp_smiliessearch, $wp_smiliesreplace;
     $output = '';
-	if ($use_smilies) {
+	if (get_settings('use_smilies')) {
 		// 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