Changeset 21735 for trunk/wp-admin/includes/template.php

Timestamp:

09/04/2012 04:29:28 PM (12 years ago)

Author:

ryan

Message:

Use get_post() instead of global $post.
Make the $post argument to get_post() optional, defaulting to the current post in The Loop.

Props nacin
see #21309

File:

• trunk/wp-admin/includes/template.php (modified) (6 diffs)

trunk/wp-admin/includes/template.php

@@ -167 +167 @@
  */
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
-    global $post_ID;
-
-    if ( $post_ID )
-        $checked_terms = wp_get_object_terms($post_ID, $taxonomy, array('fields'=>'ids'));
+    $post = get_post();
+    if ( $post->ID )
+        $checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
     else
         $checked_terms = array();
@@ -576 +575 @@
  */
 function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
-    global $wp_locale, $post, $comment;
+    global $wp_locale, $comment;
+    $post = get_post();
 
     if ( $for_post )
@@ -671 +671 @@
  */
 function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
-    global $wpdb, $post_ID;
+    global $wpdb;
+    $post = get_post();
     $items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
 
@@ -677 +678 @@
         foreach ( $items as $item ) {
             // A page cannot be its own parent.
-            if (!empty ( $post_ID ) ) {
-                if ( $item->ID == $post_ID ) {
-                    continue;
-                }
-            }
+            if ( $post->ID && $item->ID == $post->ID )
+                continue;
+
             $pad = str_repeat( ' ', $level * 3 );
             if ( $item->ID == $default)
@@ -1346 +1345 @@
  */
 function the_post_password() {
-    global $post;
-    if ( isset( $post->post_password ) ) echo esc_attr( $post->post_password );
+    $post = get_post();
+    if ( isset( $post->post_password ) )
+        echo esc_attr( $post->post_password );
 }
 
@@ -1357 +1357 @@
  *
  * @since 2.7.0
- * @param int $post_id The post id. If not supplied the global $post is used.
+ * @param mixed $post Post id or object. If not supplied the global $post is used.
  * @return string The post title if set
  */
-function _draft_or_post_title( $post_id = 0 ) {
-    $title = get_the_title($post_id);
-    if ( empty($title) )
-        $title = __('(no title)');
+function _draft_or_post_title( $post = 0 ) {
+    $title = get_the_title( $post );
+    if ( empty( $title ) )
+        $title = __( '(no title)' );
     return $title;
 }