From 36841b79b3cc0bea2a719e4356c8cf2512e761b1 Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Tue, 6 Jan 2004 10:44:41 +0000 Subject: [PATCH] More bug fixes. git-svn-id: https://develop.svn.wordpress.org/trunk@726 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-blog-header.php | 2 +- wp-includes/vars.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wp-blog-header.php b/wp-blog-header.php index 7cfa9a1839..07234917b7 100644 --- a/wp-blog-header.php +++ b/wp-blog-header.php @@ -227,7 +227,7 @@ if (empty($orderby)) { if ((!$whichcat) && (!$m) && (!$p) && (!$w) && (!$s) && empty($poststart) && empty($postend)) { if ($what_to_show == 'posts') { $limits = ' LIMIT '.$posts_per_page; - } elseif ($what_to_show == 'days') { + } elseif ($what_to_show == 'days' && empty($monthnum) && empty($year) && empty($day)) { $lastpostdate = get_lastpostdate(); $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate); $lastpostdate = mysql2date('U',$lastpostdate); diff --git a/wp-includes/vars.php b/wp-includes/vars.php index c474a5514e..7ee3e4fd17 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -262,10 +262,7 @@ uksort($wpsmiliestrans, 'smiliescmp'); # generates smilies' search & replace arrays foreach($wpsmiliestrans as $smiley => $img) { $wp_smiliessearch[] = $smiley; - $smiley_masked = ''; - for ($i = 0; $i < strlen($smiley); $i = $i + 1) { - $smiley_masked .= substr($smiley, $i, 1).chr(160); - } + $smiley_masked = str_replace(' ', '', $smiley); $wp_smiliesreplace[] = " $smiley_masked"; }