WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In `general-template.php` - remove dead code: 

* In `get_calendar()`, `$cache` is set twice. The first is useless. 
* In `wp_default_editor()`, `$user` is (accidentally) assigned in a condition. Since it is never used, this is unnecessary.
* In `language_attributes()`, `$output` is set twice before it is ever used. The first is unnecessary. 
* In `paginate_links()`, `$n` is set twice before it is ever used. The first is unnecessary.

See #27882.


Built from https://develop.svn.wordpress.org/trunk@28274


git-svn-id: http://core.svn.wordpress.org/trunk@28102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-06 04:58:16 +00:00
parent dd73ad4299
commit 9bdbd50ac0
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/general-template.php
View File

@ -1388,7 +1388,6 @@ function calendar_week_mod($num) {
function get_calendar($initial = true, $echo = true) {
global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
$cache = array();
$key = md5( $m . $monthnum . $year );
if ( $cache = wp_cache_get( 'get_calendar', 'calendar' ) ) {
if ( is_array($cache) && isset( $cache[ $key ] ) ) {
@ -2244,7 +2243,7 @@ function user_can_richedit() {
*/
function wp_default_editor() {
$r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
if ( $user = wp_get_current_user() ) { // look for cookie
if ( wp_get_current_user() ) { // look for cookie
$ed = get_user_setting('editor', 'tinymce');
$r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
}
@ -2345,7 +2344,6 @@ function the_search_query() {
*/
function language_attributes($doctype = 'html') {
$attributes = array();
$output = '';
if ( function_exists( 'is_rtl' ) && is_rtl() )
$attributes[] = 'dir="rtl"';
@ -2453,7 +2451,6 @@ function paginate_links( $args = '' ) {
$add_args = is_array($add_args) ? $add_args : false;
$r = '';
$page_links = array();
$n = 0;
$dots = false;
if ( $prev_next && $current && 1 < $current ) :