diff --git a/wp-includes/template-functions-comment.php b/wp-includes/template-functions-comment.php index ae7cf5ac1..32738bf40 100644 --- a/wp-includes/template-functions-comment.php +++ b/wp-includes/template-functions-comment.php @@ -54,7 +54,7 @@ function comments_popup_script($width=400, $height=400, $file='wp-comments-popup global $wpcommentspopupfile, $wptrackbackpopupfile, $wppingbackpopupfile, $wpcommentsjavascript; $wpcommentspopupfile = $file; $wpcommentsjavascript = 1; - $javascript = "\n"; + $javascript = "\n"; echo $javascript; } @@ -74,7 +74,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com } else { if (!empty($post->post_password)) { // if there's a password if ($HTTP_COOKIE_VARS['wp-postpass_'.$cookiehash] != $post->post_password) { // and it doesn't match the cookie - echo("Enter your password to view comments"); + echo('Enter your password to view comments'); return; } } @@ -171,7 +171,7 @@ function comment_author_url_link($linktext='', $before='', $after='') { if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) { $display = ($linktext != '') ? $linktext : stripslashes($url); echo $before; - echo "$display"; + echo ''.$display.''; echo $after; } } @@ -237,7 +237,7 @@ function comments_rss_link($link_text='Comments RSS', $commentsrssfilename = 'wp $url = $siteurl.'/'.$commentsrssfilename.$querystring_start.'p'.$querystring_equal.$id; } - echo "$link_text"; + echo ''.$link_text.''; } function comment_author_rss() { diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php index 5bbd41c4b..a152809c5 100644 --- a/wp-includes/template-functions-general.php +++ b/wp-includes/template-functions-general.php @@ -35,49 +35,49 @@ function get_bloginfo($show='') { } switch($show) { - case "url": - $output = $siteurl."/".$blogfilename; + case 'url': + $output = $siteurl.'/'.$blogfilename; break; - case "description": + case 'description': $output = $blogdescription; break; - case "rdf_url": + case 'rdf_url': $output = $siteurl.'/wp-rdf.php'; if ($do_perma) { $output = $feed_url . '/rdf/'; } break; - case "rss_url": + case 'rss_url': $output = $siteurl.'/wp-rss.php'; if ($do_perma) { $output = $feed_url . '/rss/'; } break; - case "rss2_url": + case 'rss2_url': $output = $siteurl.'/wp-rss2.php'; if ($do_perma) { $output = $feed_url . '/rss2/'; } break; - case "atom_url": + case 'atom_url': $output = $siteurl.'/wp-atom.php'; if ($do_perma) { $output = $feed_url . '/atom/'; } break; - case "comments_rss2_url": + case 'comments_rss2_url': $output = $siteurl.'/wp-commentsrss2.php'; if ($do_perma) { $output = $comment_feed_url . '/rss2/'; } break; - case "pingback_url": + case 'pingback_ur'": $output = $siteurl.'/xmlrpc.php'; break; - case "admin_email": + case 'admin_email': $output = $admin_email; break; - case "name": + case 'name': default: $output = $blogname; break; @@ -213,7 +213,7 @@ function get_archives($type='', $limit='', $format='html', $before = "", $after if ('' != $limit) { $limit = (int) $limit; - $limit = " LIMIT $limit"; + $limit = ' LIMIT '.$limit; } // this is what will separate dates on weekly archive links $archive_week_separator = '–'; @@ -247,10 +247,10 @@ function get_archives($type='', $limit='', $format='html', $before = "", $after foreach ($arcresults as $arcresult) { $url = get_month_link($arcresult->year, $arcresult->month); if ($show_post_count) { - $text = sprintf("%s %d", $month[zeroise($arcresult->month,2)], $arcresult->year); - $after = " ($arcresult->posts)"; + $text = sprintf('%s %d', $month[zeroise($arcresult->month,2)], $arcresult->year); + $after = ' ('.$arcresult->posts.')'; } else { - $text = sprintf("%s %d", $month[zeroise($arcresult->month,2)], $arcresult->year); + $text = sprintf('%s %d', $month[zeroise($arcresult->month,2)], $arcresult->year); } echo get_archives_link($url, $text, $format, $before, $after); } @@ -279,7 +279,7 @@ function get_archives($type='', $limit='', $format='html', $before = "", $after $arc_week = get_weekstartend($arcresult->yyyymmdd, $start_of_week); $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']); $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']); - $url = sprintf("%s/%s%sm%s%s%sw%s%d", $siteurl, $blogfilename, $querystring_start, + $url = sprintf('%s/%s%sm%s%s%sw%s%d', $siteurl, $blogfilename, $querystring_start, $querystring_equal, $arc_year, $querystring_separator, $querystring_equal, $arcresult->week); $text = $arc_week_start . $archive_week_separator . $arc_week_end; @@ -459,7 +459,7 @@ function get_calendar($daylength = 1) { if ($day == date('j', (time() + ($time_difference * 3600))) && $thismonth == date('m', time()+($time_difference * 3600))) echo '