WordPress.org
Get WordPress

Make WordPress Core

Changeset 15116


Ignore:
Timestamp:
06/02/2010 08:04:07 PM (15 years ago)
Author:
ryan
Message:

Cut 'em out, move 'em on, trailing whitespace

Location:
trunk
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-ajax.php

    r15075 r15116  
    11161116            )
    11171117        ));
    1118        
     1118
    11191119        $markup = ob_get_clean();
    1120        
     1120
    11211121        echo json_encode(array(
    11221122            'replace-id' => $type . '-' . $item->name,

  • trunk/wp-admin/includes/nav-menu.php

    r15100 r15116  
    695695                <?php
    696696                $args['walker'] = $walker;
    697                
     697
    698698                // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
    699699                if ( 'page' == $post_type_name ) {
    … …  
    11071107}
    11081108
    1109 /** 
     1109/**
    11101110 * Deletes orphaned draft menu items
    11111111 *

  • trunk/wp-admin/js/link.dev.js

    r14940 r15116  
    5757        $('a[href="#categories-pop"]').click();
    5858
    59     $('#category-add-toggle').click( function() {       
     59    $('#category-add-toggle').click( function() {
    6060        $(this).parents('div:first').toggleClass( 'wp-hidden-children' );
    6161        $('#category-tabs a[href="#categories-all"]').click();

  • trunk/wp-admin/js/nav-menu.dev.js

    r15080 r15116  
    139139                                listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10);
    140140                            if ( this.className && -1 != this.className.indexOf('add-to-top') )
    141                                 processMethod = api.addMenuItemToTop; 
     141                                processMethod = api.addMenuItemToTop;
    142142                            menuItems[listItemDBID] = t.closest('li').getItemData( 'add-menu-item', listItemDBID );
    143143                        });
    144                        
     144
    145145                        // Add the items
    146146                        api.addItemToMenu(menuItems, processMethod, function(){
    … …  
    250250                start: function(e, ui) {
    251251                    var height, width, parent, children, maxChildDepth, tempHolder;
    252                    
     252
    253253                    // handle placement for rtl orientation
    254254                    if ( api.isRTL )
    … …  
    623623                    return false;
    624624                } else if ( target.hasClass('page-numbers') ) {
    625                     $.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox', 
     625                    $.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox',
    626626                        function( resp ) {
    627627                            if ( -1 == resp.indexOf('replace-id') )
    … …  
    647647                        }
    648648                    );
    649                    
     649
    650650                    return false;
    651651                }
    … …  
    671671                fixedRight = fixedLeft + fixedWidth;
    672672                active.makeTabVisible();
    673                
     673
    674674                // Prevent space from building up next to the last tab if there's more to show
    675675                if( tabs.last().isTabVisible() ) {

  • trunk/wp-admin/js/post.dev.js

    r14940 r15116  
    316316        $('#' + taxonomy + '-add-toggle').click( function() {
    317317            $('#' + taxonomy + '-adder').toggleClass( 'wp-hidden-children' );
    318             $('a[href="#' + taxonomy + '-all"]', '#' + taxonomy + '-tabs').click();         
     318            $('a[href="#' + taxonomy + '-all"]', '#' + taxonomy + '-tabs').click();
    319319            $('#new'+taxonomy).focus();
    320320            return false;

  • trunk/wp-admin/ms-admin.php

    r15054 r15116  
    1919$parent_file = 'ms-admin.php';
    2020
    21 add_contextual_help($current_screen, 
     21add_contextual_help($current_screen,
    2222    '<p>' . __('Until WordPress 3.0, running multiple sites required using WordPress MU instead of regular WordPress. In version 3.0, these applications have merged. If you are a former MU user, you should be aware of the following changes:') . '</p>' .
    2323    '<ul><li>' . __('Site Admin is now Super Admin (we highly encourage you to get yourself a cape!).') . '</li>' .

  • trunk/wp-admin/ms-options.php

    r15102 r15116  
    1919$parent_file = 'ms-admin.php';
    2020
    21 add_contextual_help($current_screen, 
     21add_contextual_help($current_screen,
    2222    '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
    2323    '<p>' . __('Operational settings has fields for the network&#8217;s name, admin email, and whether global terms will be disabled (the default) or maintained across all sites on the network.') . '</p>' .

  • trunk/wp-admin/ms-sites.php

    r15054 r15116  
    2020
    2121if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
    22     add_contextual_help($current_screen, 
     22    add_contextual_help($current_screen,
    2323        '<p>' . __('The network admin arrives at this screen to make choices for a given site by clicking on the Edit link on the Sites screen available to them in the Super Admin navigation menu.') . '</p>' .
    2424        '<p>' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing the Site User(s) roles and passwords for that site, Adding a new user, and Miscellaneous Site Actions (upload size limits).') . '</p>' .
    … …  
    2929    );
    3030} else {
    31     add_contextual_help($current_screen, 
     31    add_contextual_help($current_screen,
    3232        '<p>' . __('Add New takes you farther down on this same page. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
    3333        '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .

  • trunk/wp-admin/ms-themes.php

    r15004 r15116  
    1616$parent_file = 'ms-admin.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
    2020    '<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .

  • trunk/wp-admin/ms-upgrade-network.php

    r15004 r15116  
    1818$parent_file = 'ms-admin.php';
    1919
    20 add_contextual_help($current_screen, 
     20add_contextual_help($current_screen,
    2121    '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database upgrades are applied.') . '</p>' .
    2222    '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .

  • trunk/wp-admin/ms-users.php

    r15102 r15116  
    1919$parent_file = 'ms-admin.php';
    2020
    21 add_contextual_help($current_screen, 
     21add_contextual_help($current_screen,
    2222    '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
    2323    '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .

  • trunk/wp-admin/my-sites.php

    r15094 r15116  
    3939$parent_file = 'index.php';
    4040
    41 add_contextual_help($current_screen, 
     41add_contextual_help($current_screen,
    4242    '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
    4343    '<p>' . __('Up until WordPress version 3.0, what is now called a Multi-site Network had to be installed separately as WordPress MU (multi-user).') . '</p>' .

  • trunk/wp-admin/nav-menus.php

    r15100 r15116  
    442442$help .= '<p>' . __('You can create custom menus for your site. These menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '</p>';
    443443$help .= '<p>' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You&#8217;ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. You&#8217;ll see when the position of the drop target shifts over to create the nested placement. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>';
    444 $help .= '<p><strong>' . __('For more information:') . '</strong></p>'; 
     444$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
    445445$help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_SubPanel">Menus Documentation</a>') . '</p>';
    446446$help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
    … …  
    566566                    <div id="post-body">
    567567                        <div id="post-body-content">
    568                             <?php 
     568                            <?php
    569569                            if ( is_nav_menu( $nav_menu_selected_id ) ) :
    570570                                $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  );
    … …  
    578578                                echo '<p>' . __('When you have finished building your custom menu, make sure you click the Save Menu button.') . '</p>';
    579579                                echo '</div>';
    580                             endif; 
     580                            endif;
    581581                            ?>
    582582                        </div><!-- /#post-body-content -->

  • trunk/wp-admin/network.php

    r15076 r15116  
    9090$parent_file = 'tools.php';
    9191
    92 add_contextual_help($current_screen, 
     92add_contextual_help($current_screen,
    9393    '<p>' . __('This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
    9494    '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .

  • trunk/wp-admin/options-discussion.php

    r15000 r15116  
    1616$parent_file = 'options-general.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation link below to get information on what each discussion setting does.') . '</p>' .
    2020    '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .

  • trunk/wp-admin/options-general.php

    r15103 r15116  
    5151add_filter('admin_head', 'add_js');
    5252
    53 add_contextual_help($current_screen, 
     53add_contextual_help($current_screen,
    5454    '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
    5555    '<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>' .

  • trunk/wp-admin/options-media.php

    r15103 r15116  
    1616$parent_file = 'options-general.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>' .
    2020    '<p>' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.') . '</p>' .

  • trunk/wp-admin/options-permalink.php

    r15071 r15116  
    1616$parent_file = 'options-general.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('This screen provides some common options for your default permalinks URL structure.') . '</p>' .
    2020    '<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .

  • trunk/wp-admin/options-privacy.php

    r15094 r15116  
    1616$parent_file = 'options-general.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the second option here. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
    2020    '<p>' . __('When this setting is in effect a reminder is shown in the header of these administration screens that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>' .

  • trunk/wp-admin/options-reading.php

    r15000 r15116  
    1616$parent_file = 'options-general.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
    2020    '<p>' . __('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="post-new.php?post_type=page">Pages</a>. One will become the front page, and the other will be where your posts are displayed.') . '</p>' .

  • trunk/wp-admin/options-writing.php

    r15000 r15116  
    1616$parent_file = 'options-general.php';
    1717
    18 add_contextual_help($current_screen, 
     18add_contextual_help($current_screen,
    1919    '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within these administration screens, while the rest control external publishing methods. For more information on any of these methods, use the documentation links below.') . '</p>' .
    2020    '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .

  • trunk/wp-admin/plugins.php

    r15017 r15116  
    310310    '<p>' . sprintf(__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your <code>/wp-content/plugins</code> directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '</p>' .
    311311    '<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
    312     '<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>' .   
     312    '<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>' .
    313313    '<p><strong>' . __('For more information:') . '</strong></p>' .
    314314    '<p>' . __('<a href="http://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>') . '</p>' .

  • trunk/wp-admin/themes.php

    r15094 r15116  
    3838if ( current_user_can('install_themes') )
    3939    $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s">WordPress.org theme repository</a>. Themes in the WordPress.org theme repository are designed and developed by third parties, and are licensed under the GNU General Public License, version 2, just like WordPress. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/') . '</p>';
    40    
     40
    4141$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
    4242$help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>';

  • trunk/wp-admin/user-edit.php

    r15103 r15116  
    3737add_contextual_help($current_screen,
    3838    '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
    39     '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '</p>' . 
     39    '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '</p>' .
    4040    '<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
    4141    '<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
    42     '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>' . 
    43     '<p><strong>' . __('For more information:') . '</strong></p>' . 
     42    '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>' .
     43    '<p><strong>' . __('For more information:') . '</strong></p>' .
    4444    '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Users_Your_Profile_SubPanel">Documentation on User Profiles</a>') . '</p>' .
    45     '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>' 
     45    '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
    4646);
    4747

  • trunk/wp-admin/user-new.php

    r15103 r15116  
    109109$parent_file = 'users.php';
    110110
    111 add_contextual_help($current_screen, 
    112     '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' . 
    113     '<ul>' . 
     111add_contextual_help($current_screen,
     112    '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
     113    '<ul>' .
    114114        '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
    115         '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.')  . '</li>' . 
     115        '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.')  . '</li>' .
    116116        '<li>' . __('Authors can publish and manage their own posts.') . '</li>' .
    117         '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' . 
    118         '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' . 
     117        '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
     118        '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
    119119    '</ul>' .
    120120    '<p>' . __('You must assign a password to the new user, but don&#8217;t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' .
    … …  
    122122    '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>' .
    123123    '<p><strong>' . __('For more information:') . '</strong></p>' .
    124     '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Users_Add_New_SubPanel">Documentation on Adding New Users</a>') . '</p>' . 
     124    '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Users_Add_New_SubPanel">Documentation on Adding New Users</a>') . '</p>' .
    125125    '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
    126126);

  • trunk/wp-admin/users.php

    r15101 r15116  
    2222add_contextual_help($current_screen,
    2323    '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options when they are logged in, based on their role.') . '</p>' .
    24     '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' . 
    25     '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>' . 
     24    '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' .
     25    '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>' .
    2626    '<p><strong>' . __('For more information:') . '</strong></p>' .
    2727    '<p>' . __('<a target="_blank" href=http://codex.wordpress.org/Users_Authors_and_Users_SubPanel">Documentation on Authors and Users</a>') . '</p>' .
    2828    '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Roles_and_Capabilities">Roles and Capabilities Descriptions</a>') . '</p>' .
    29     '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>' 
     29    '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
    3030);
    3131

  • trunk/wp-includes/feed.php

    r14952 r15116  
    192192/**
    193193 * Outputs the link to the comments for the current post in an xml safe way
    194  * 
     194 *
    195195 * @since 3.0.0
    196196 * @return none

  • trunk/wp-includes/functions.php

    r15106 r15116  
    23072307    fclose( $ifp );
    23082308    clearstatcache();
    2309    
     2309
    23102310    // Set correct file permissions
    23112311    $stat = @ stat( dirname( $new_file ) );

  • trunk/wp-includes/l10n.php

    r15064 r15116  
    367367
    368368    load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
    369    
     369
    370370    if ( is_multisite() || ( defined( 'WP_NETWORK_ADMIN_PAGE' ) && WP_NETWORK_ADMIN_PAGE ) ) {
    371371        load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );

  • trunk/wp-includes/nav-menu-template.php

    r15113 r15116  
    315315            }
    316316        }
    317        
     317
    318318        // back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
    319         if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id ) 
     319        if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
    320320            $classes[] = 'current_page_parent';
    321321
    … …  
    344344        if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
    345345            $classes[] = 'current-' . $active_object . '-parent';
    346        
     346
    347347        if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
    348348            // Back compat classes for pages to match wp_page_menu()
    … …  
    352352                $classes[] = 'current_page_ancestor';
    353353        }
    354        
     354
    355355        $menu_items[$key]->classes = array_unique( $classes );
    356356    }

  • trunk/wp-includes/nav-menu.php

    r15112 r15116  
    285285
    286286    $args = wp_parse_args( $menu_item_data, $defaults );
    287    
     287
    288288    if ( 0 == $menu_id ) {
    289289        $args['menu-item-position'] = 1;
    … …  
    368368    update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
    369369    update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
    370    
     370
    371371    $args['menu-item-classes'] = array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-classes'] ) );
    372372    $args['menu-item-xfn'] = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
    … …  
    374374    update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
    375375    update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
    376    
     376
    377377    if ( 0 == $menu_id )
    378378        update_post_meta( $menu_item_db_id, '_menu_item_orphaned', time() );

  • trunk/wp-includes/post-template.php

    r15088 r15116  
    128128 * post. The reason you should not use it as a link, is because of moving the
    129129 * blog across domains.
    130  * 
     130 *
    131131 * Url is escaped to make it xml safe
    132132 *

  • trunk/wp-includes/taxonomy.php

    r15110 r15116  
    23962396    $tax_obj = get_taxonomy($taxonomy);
    23972397    $object_types = esc_sql($tax_obj->object_type);
    2398     $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'"); 
     2398    $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
    23992399    foreach ( $results as $row ) {
    24002400        $id = $term_ids[$row->term_taxonomy_id];
Note: See TracChangeset for help on using the changeset viewer.