Changes from trunk/wp-admin/includes/template.php at r18314 to branches/3.1/wp-admin/includes/template.php at r18018

File:

• branches/3.1/wp-admin/includes/template.php (modified) (11 diffs)

branches/3.1/wp-admin/includes/template.php

@@ -426 +426 @@
     <thead>
     <tr>
-        <th class="left">' . _x( 'Name', 'meta name' ) . '</th>
+        <th class="left">' . __( 'Name' ) . '</th>
         <th>' . __( 'Value' ) . '</th>
     </tr>
@@ -441 +441 @@
     <thead>
     <tr>
-        <th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
+        <th class="left"><?php _e( 'Name' ) ?></th>
         <th><?php _e( 'Value' ) ?></th>
     </tr>
@@ -536 +536 @@
 <thead>
 <tr>
-<th class="left"><label for="metakeyselect"><?php _ex( 'Name', 'meta name' ) ?></label></th>
+<th class="left"><label for="metakeyselect"><?php _e( 'Name' ) ?></label></th>
 <th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
 </tr>
@@ -943 +943 @@
         // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
         if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-            foreach ( $sorted as $box_context => $ids ) {
-                foreach ( explode(',', $ids ) as $id ) {
+            foreach ( $sorted as $box_context => $ids )
+                foreach ( explode(',', $ids) as $id )
                     if ( $id )
                         add_meta_box( $id, null, null, $page, $box_context, 'sorted' );
-                }
-            }
         }
         $already_sorted = true;
@@ -964 +962 @@
                     $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
                     echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-                    if ( 'dashboard_browser_nag' != $box['id'] )
-                        echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
+                    echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
                     echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
                     echo '<div class="inside">' . "\n";
@@ -1631 +1628 @@
 
     if ( !empty($post->post_password) )
-        $post_states['protected'] = __('Password protected');
+        $post_states[] = __('Password protected');
     if ( 'private' == $post->post_status && 'private' != $post_status )
-        $post_states['private'] = __('Private');
+        $post_states[] = __('Private');
     if ( 'draft' == $post->post_status && 'draft' != $post_status )
-        $post_states['draft'] = __('Draft');
+        $post_states[] = __('Draft');
     if ( 'pending' == $post->post_status && 'pending' != $post_status )
         /* translators: post state */
-        $post_states['pending'] = _x('Pending', 'post state');
+        $post_states[] = _x('Pending', 'post state');
     if ( is_sticky($post->ID) )
-        $post_states['sticky'] = __('Sticky');
+        $post_states[] = __('Sticky');
 
     $post_states = apply_filters( 'display_post_states', $post_states );
@@ -1659 +1656 @@
 }
 
-function _media_states( $post ) {
-    $media_states = array();
-    $stylesheet = get_option('stylesheet');
-
-    if ( current_theme_supports( 'custom-header') ) {
-        $meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
-        if ( ! empty( $meta_header ) && $meta_header == $stylesheet )
-            $media_states[] = __( 'Header Image' );
-    }
-
-    if ( current_theme_supports( 'custom-background') ) {
-        $meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
-        if ( ! empty( $meta_background ) && $meta_background == $stylesheet )
-            $media_states[] = __( 'Background Image' );
-    }
-
-    $media_states = apply_filters( 'display_media_states', $media_states );
-
-    if ( ! empty( $media_states ) ) {
-        $state_count = count( $media_states );
-        $i = 0;
-        echo ' - ';
-        foreach ( $media_states as $state ) {
-            ++$i;
-            ( $i == $state_count ) ? $sep = '' : $sep = ', ';
-            echo "<span class='post-state'>$state$sep</span>";
-        }
-    }
-}
-
 /**
  * Convert a screen string to a screen object
@@ -1750 +1717 @@
     if ( !empty($wp_current_screen_options) )
         $show_screen = true;
-
-    $show_screen = apply_filters('screen_options_show_screen', $show_screen, $screen);
 
 ?>
@@ -1958 +1923 @@
 }
 
-function screen_icon( $screen = '' ) {
-    echo get_screen_icon( $screen );
-}
-
-function get_screen_icon( $screen = '' ) {
+function screen_icon($screen = '') {
     global $current_screen, $typenow;
 
@@ -1990 +1951 @@
     }
 
-    return '<div id="icon-' . esc_attr( $name ) . '" class="' . $class . '"><br /></div>';
+?>
+    <div id="icon-<?php echo $name; ?>" class="<?php echo $class; ?>"><br /></div>
+<?php
 }
 
@@ -2227 +2190 @@
     return $button;
 }
+