Changeset 4144 for trunk/wp-includes/formatting.php
- Timestamp:
- 08/30/2006 09:46:31 PM (20 years ago)
- File:
-
- 1 edited
-
trunk/wp-includes/formatting.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/formatting.php
r4135 r4144 607 607 global $wp_smiliessearch, $wp_smiliesreplace; 608 608 $output = ''; 609 if (get_ settings('use_smilies')) {609 if (get_option('use_smilies')) { 610 610 // HTML loop taken from texturize function, could possible be consolidated 611 611 $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between … … 657 657 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); 658 658 $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); 660 660 return $string_gmt; 661 661 } … … 666 666 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); 667 667 $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); 669 669 return $string_localtime; 670 670 } … … 691 691 $offset = iso8601_timezone_to_offset($date_bits[7]); 692 692 } 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'); 694 694 } 695 695 $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.