Changeset 5796

Timestamp:

07/11/2007 07:57:43 PM (17 years ago)

Author:

ryan

Message:

Post filter rework. see #4546

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/post.php (modified) (6 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -162 +162 @@
 function get_post_to_edit( $id ) {
 
-    $post = get_post( $id );
-
-    $post->post_content = format_to_edit( $post->post_content, user_can_richedit() );
-    $post->post_content = apply_filters( 'content_edit_pre', $post->post_content);
-
-    $post->post_excerpt = format_to_edit( $post->post_excerpt);
-    $post->post_excerpt = apply_filters( 'excerpt_edit_pre', $post->post_excerpt);
-
-    $post->post_title = format_to_edit( $post->post_title );
-    $post->post_title = apply_filters( 'title_edit_pre', $post->post_title );
-
-    $post->post_password = format_to_edit( $post->post_password );
-
-    $post->menu_order = (int) $post->menu_order;
+    $post = get_post( $id, OBJECT, 'edit' );
 
     if ( $post->post_type == 'page' )

trunk/wp-includes/functions.php

@@ -1291 +1291 @@
 
 function wp_parse_args( $args, $defaults = '' ) {
-    if ( is_array( $args ) )
+    if ( is_object($args) )
+        $r = get_object_vars($args);
+    else if ( is_array( $args ) )
         $r =& $args;
     else

trunk/wp-includes/post.php

@@ -93 +93 @@
 // Retrieves post data given a post ID or post object.
 // Handles post caching.
-function &get_post(&$post, $output = OBJECT) {
+function &get_post(&$post, $output = OBJECT, $filter = 'raw') {
     global $post_cache, $wpdb, $blog_id;
 
@@ -125 +125 @@
         unset($post_cache[$blog_id]);
 
+    $_post = sanitize_post($_post, $filter);
+
     if ( $output == OBJECT ) {
         return $_post;
@@ -134 +136 @@
         return $_post;
     }
+}
+
+function get_post_field( $field, $post, $context = 'display' ) {
+    $post = (int) $post;
+    $post = get_term( $post );
+
+    if ( is_wp_error($post) )
+        return $post;
+
+    if ( !is_object($post) )
+        return '';
+
+    if ( !isset($post->$field) )
+        return '';
+
+    return sanitize_post_field($field, $post->$field, $post->ID, $context);
 }
 
@@ -399 +417 @@
 }
 
+function sanitize_post($post, $context = 'display') {
+    // TODO: Use array keys instead of hard coded list
+    $fields = array('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_date', 'post_date_gmt', 'post_parent', 'menu_order', 'post_mime_type');
+
+    if ( 'raw' == $context )
+        return $post;
+
+    $do_object = false;
+    if ( is_object($post) )
+        $do_object = true;
+
+    foreach ( $fields as $field ) {
+        if ( $do_object )
+            $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+        else
+            $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);  
+    }
+
+    return $post;
+}
+
+function sanitize_post_field($field, $value, $post_id, $context) {
+    $int_fields = array('ID', 'post_parent', 'menu_order');
+    if ( in_array($field, $int_fields) )
+        $value = (int) $value;
+
+    $prefixed = false;
+    if ( false !== strpos($field, 'post_') ) {
+        $prefixed = true;
+        $field_no_prefix = str_replace('post_', '', $field);
+    }
+
+    if ( 'edit' == $context ) {
+        $format_to_edit = array('post_content', 'post_excerpt', 'post_title', 'post_password');
+
+        if ( $prefixed ) {
+            $value = apply_filters("edit_$field", $value, $post_id);
+            // Old school
+            $value = apply_filters("${field_no_prefix}_edit_pre", $value, $post_id);
+        } else {
+            $value = apply_filters("edit_post_$field", $value, $post_id);
+        }
+
+        if ( in_array($field, $format_to_edit) ) {
+            if ( 'post_content' == $field )
+                $value = format_to_edit($value, user_can_richedit());
+            else
+                $value = format_to_edit($value);
+        } else {
+            $value = attribute_escape($value);
+        }
+    } else if ( 'db' == $context ) {
+        if ( $prefixed ) {
+            $value = apply_filters("pre_$field", $value);
+            $value = apply_filters("${field_no_prefix}_save_pre", $value);
+        } else {
+            $value = apply_filters("pre_post_$field", $value);
+            $value = apply_filters("${field}_pre", $value);
+        }
+    } else {
+        // Use display filters by default.
+        $value = apply_filters("post_$field", $value, $post_id, $context);
+    }
+
+    if ( 'attribute' == $context )
+        $value = attribute_escape($value);
+    else if ( 'js' == $context )
+        $value = js_escape($value);
+
+    return $value;
+}
+
 function wp_delete_post($postid = 0) {
     global $wpdb, $wp_rewrite;
@@ -492 +582 @@
     global $wpdb, $wp_rewrite, $allowedtags, $user_ID;
 
-    if ( is_object($postarr) )
-        $postarr = get_object_vars($postarr);
+    $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
+        'ping_status' => get_option('default_ping_status'), 'post_pingback' => get_option('default_pingback_flag'),
+        'post_parent' => 0, 'menu_order' => 0, 'to_ping' =>  '', 'pinged' => '', 'post_password' => '');
+
+    $postarr = wp_parse_args($postarr, $defaults);
+
+    if ( empty($postarr['no_filter']) )
+        $postarr = sanitize_post($postarr, 'db');
 
     // export array as variables
@@ -504 +600 @@
         $post = & get_post($ID);
         $previous_status = $post->post_status;
-    }
-
-    // Get the basics.
-    if ( empty($no_filter) ) {
-        $post_content    = apply_filters('content_save_pre',   $post_content);
-        $post_content_filtered = apply_filters('content_filtered_save_pre',   $post_content_filtered);
-        $post_excerpt    = apply_filters('excerpt_save_pre',   $post_excerpt);
-        $post_title      = apply_filters('title_save_pre',     $post_title);
-        $post_category   = apply_filters('category_save_pre',  $post_category);
-        $post_status     = apply_filters('status_save_pre',    $post_status);
-        $post_name       = apply_filters('name_save_pre',      $post_name);
-        $comment_status  = apply_filters('comment_status_pre', $comment_status);
-        $ping_status     = apply_filters('ping_status_pre',    $ping_status);
-        $tags_input      = apply_filters('tags_input_pre',     $tags_input);
     }
 

trunk/wp-includes/taxonomy.php

@@ -440 +440 @@
     }
 
-    // TODO: attribute is usually done in an edit context, so display filters probably
-    // not appropriate.
     if ( 'attribute' == $context )
         $value = attribute_escape($value);