Make WordPress Core


Ignore:
Timestamp:
08/30/2006 09:46:31 PM (20 years ago)
Author:
ryan
Message:

Use get_option instead of get_settings. Just 'cause.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/formatting.php

    r4135 r4144  
    607607    global $wp_smiliessearch, $wp_smiliesreplace;
    608608    $output = '';
    609     if (get_settings('use_smilies')) {
     609    if (get_option('use_smilies')) {
    610610        // HTML loop taken from texturize function, could possible be consolidated
    611611        $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
     
    657657  preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
    658658  $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
    659   $string_gmt = gmdate('Y-m-d H:i:s', $string_time - get_settings('gmt_offset') * 3600);
     659  $string_gmt = gmdate('Y-m-d H:i:s', $string_time - get_option('gmt_offset') * 3600);
    660660  return $string_gmt;
    661661}
     
    666666  preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
    667667  $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
    668   $string_localtime = gmdate('Y-m-d H:i:s', $string_time + get_settings('gmt_offset')*3600);
     668  $string_localtime = gmdate('Y-m-d H:i:s', $string_time + get_option('gmt_offset')*3600);
    669669  return $string_localtime;
    670670}
     
    691691      $offset = iso8601_timezone_to_offset($date_bits[7]);
    692692    } else { // we don't have a timezone, so we assume user local timezone (not server's!)
    693       $offset = 3600 * get_settings('gmt_offset');
     693      $offset = 3600 * get_option('gmt_offset');
    694694    }
    695695    $timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]);
Note: See TracChangeset for help on using the changeset viewer.