Changeset 6331

Show
Ignore:
Timestamp:
11/12/07 19:33:06 (10 months ago)
Author:
ryan
Message:

Eliminate warnings in convert_smilies. Props tellyworth. fixes #5340

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/formatting.php

    r6314 r6331  
    665665    global $wp_smiliessearch, $wp_smiliesreplace; 
    666666    $output = ''; 
    667     if (get_option('use_smilies')) { 
     667    if ( get_option('use_smilies') && !empty($wp_smiliessearch) && !empty($wp_smiliesreplace) ) { 
    668668        // HTML loop taken from texturize function, could possible be consolidated 
    669669        $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between