Make WordPress Core

Ticket #13017: 13017.patch

File 13017.patch, 3.9 KB (added by hakre, 15 years ago)

Whitespace and Documentation Issues, Code Improvements

  • wp-admin/includes/template.php

    ### Eclipse Workspace Patch 1.0
    #P wordpress-trunk
     
    28362836}
    28372837
    28382838/**
    2839  * {@internal Missing Short Description}}
     2839 * Meta-Box template function
    28402840 *
    2841  * @since unknown
     2841 * @since 2.5.0
    28422842 *
    2843  * @param unknown_type $page
    2844  * @param unknown_type $context
    2845  * @param unknown_type $object
     2843 * @param string $page page identifier, also known as screen identifier
     2844 * @param string $context box context
     2845 * @param mixed $object gets passed to the box callback function as first parameter
    28462846 * @return int number of meta_boxes
    28472847 */
    28482848function do_meta_boxes($page, $context, $object) {
    28492849        global $wp_meta_boxes;
    28502850        static $already_sorted = false;
    28512851
     2852        //@todo remove this comment, see #13017
    28522853        //do_action('do_meta_boxes', $page, $context, $object);
    28532854
    28542855        $hidden = get_hidden_meta_boxes($page);
    28552856
    2856         echo "<div id='$context-sortables' class='meta-box-sortables'>\n";
     2857        printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
    28572858
    28582859        $i = 0;
    28592860        do {
     
    29532954        }
    29542955}
    29552956
    2956 function get_hidden_meta_boxes($screen) {
    2957         if ( is_string($screen) )
    2958                 $screen = convert_to_screen($screen);
     2957/**
     2958 * Get Hidden Meta Boxes
     2959 *
     2960 * @since 2.7
     2961 *
     2962 * @param string|object $screen Screen identifier
     2963 * @return array Hidden Meta Boxes
     2964 */
     2965function get_hidden_meta_boxes( $screen ) {
     2966        if ( is_string( $screen ) )
     2967                $screen = convert_to_screen( $screen );
    29592968
    2960         $hidden = get_user_option( "metaboxhidden_$screen->id" );
     2969        $hidden = get_user_option( "metaboxhidden_{$screen->id}" );
    29612970
    29622971        // Hide slug boxes by default
    2963         if ( !is_array($hidden) )
     2972        if ( !is_array( $hidden ) )
    29642973                $hidden = array('slugdiv');
    29652974
    29662975        return $hidden;
     
    32393248 *
    32403249 * @param unknown_type $page
    32413250 */
    3242 function manage_columns_prefs($page) {
    3243         $columns = get_column_headers($page);
     3251function manage_columns_prefs( $page ) {
     3252        $columns = get_column_headers( $page );
     3253        $hidden  = get_hidden_columns( $page );
     3254        $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username');
    32443255
    3245         $hidden = get_hidden_columns($page);
    3246 
    32473256        foreach ( $columns as $column => $title ) {
    32483257                // Can't hide these or they are special
    3249                 if ( '_title' == $column || 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column || 'comment' == $column )
     3258                if ( in_array( $column, $special ) )
    32503259                        continue;
    3251                 if ( empty($title) )
     3260                if ( empty( $title ) )
    32523261                        continue;
    32533262
    32543263                if ( 'comments' == $column )
    3255                         $title = __('Comments');
     3264                        $title = __( 'Comments' );
    32563265                $id = "$column-hide";
    32573266                echo '<label for="' . $id . '">';
    32583267                echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . (! in_array($column, $hidden) ? ' checked="checked"' : '') . ' />';
     
    35483557/**
    35493558 * Convert a screen string to a screen object
    35503559 *
     3560 * @since 3.0.0
     3561 *
    35513562 * @param string $screen The name of the screen
    35523563 * @return object An object containing the safe screen name and id
    35533564 */
    35543565function convert_to_screen( $screen ) {
    3555         $screen = str_replace('.php', '', $screen);
    3556         $screen = str_replace('-new', '', $screen);
    3557         $screen = str_replace('-add', '', $screen);
    3558         $screen = apply_filters('screen_meta_screen', $screen);
    3559 
    3560         $screen = array('id' => $screen, 'base' => $screen);
    3561         return (object) $screen;
     3566        $screen = str_replace( array('.php', '-new', '-add' ), '', $screen);
     3567        $screen = (string) apply_filters( 'screen_meta_screen', $screen );
     3568        $screen = (object) array('id' => $screen, 'base' => $screen);
     3569        return $screen;
    35623570}
    35633571
    35643572function screen_meta($screen) {
     
    35943602                        $show_screen = true;
    35953603                        break;
    35963604        }
    3597         if( !empty($settings) )
     3605        if( ! empty( $settings ) )
    35983606                $show_screen = true;
    35993607?>
    36003608<div id="screen-meta">