Changeset 2650

Timestamp:

06/19/05 01:33:38 (4 years ago)

Author:

ryan

Message:

Consolidate post update code.

Files:

• trunk/wp-admin/admin-functions.php (modified) (3 diffs)
• trunk/wp-admin/post.php (modified) (2 diffs)
• trunk/wp-includes/functions-post.php (modified) (7 diffs)

trunk/wp-admin/admin-functions.php

@@ -12 +12 @@
-    $_POST['post_excerpt']  = $_POST['excerpt'];
-    $_POST['post_parent'] = $_POST['parent_id'];
+    $_POST['to_ping'] = $_POST['trackback_url'];
-
-    if (! empty($_POST['post_author_override'])) {
@@ -21 +22 @@
-    }
-
-post_author
+_POST['post_author']
-        die( __('You cannot post as this user.') );
-    
@@ -51 +52 @@
-    // Create the post.
-    $post_ID = wp_insert_post($_POST);
+    add_meta($post_ID);
+}
+
+function edit_post() {
+    global $user_ID;
+
+    if ( !isset($blog_ID) ) 
+        $blog_ID = 1;
+
+    $post_ID = $_POST['post_ID'];
+
+    if (!user_can_edit_post($user_ID, $post_ID, $blog_ID))
+        die( __('You are not allowed to edit this post.') );
+
+    // Rename.
+    $_POST['ID'] = $_POST['post_ID'];
+    $_POST['post_content']  = $_POST['content'];
+    $_POST['post_excerpt']  = $_POST['excerpt'];
+    $_POST['post_parent'] = $_POST['parent_id'];
+    $_POST['to_ping'] = $_POST['trackback_url'];
+
+    if (! empty($_POST['post_author_override'])) {
+        $_POST['$post_author'] = (int) $_POST['post_author_override'];
+    } else if (! empty($_POST['post_author'])) {
+        $_POST['post_author'] = (int) $_POST['post_author'];
+    } else {
+        $_POST['post_author'] = (int) $_POST['user_ID'];
+    }
+
+    if ( !user_can_edit_user($user_ID, $_POST['post_author']) )
+        die( __('You cannot post as this user.') );
+
+    if (user_can_set_post_date($user_ID) && (!empty($_POST['edit_date']))) {
+        $aa = $_POST['aa'];
+        $mm = $_POST['mm'];
+        $jj = $_POST['jj'];
+        $hh = $_POST['hh'];
+        $mn = $_POST['mn'];
+        $ss = $_POST['ss'];
+        $jj = ($jj > 31) ? 31 : $jj;
+        $hh = ($hh > 23) ? $hh - 24 : $hh;
+        $mn = ($mn > 59) ? $mn - 60 : $mn;
+        $ss = ($ss > 59) ? $ss - 60 : $ss;
+        $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
+        $_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss");
+    } 
+
+    wp_update_post($_POST);
+
+    // Meta Stuff
+    if ($_POST['meta']) :
+        foreach ($_POST['meta'] as $key => $value) :
+            update_meta($key, $value['key'], $value['value']);
+        endforeach;
+    endif;
+
+    if ($_POST['deletemeta']) :
+        foreach ($_POST['deletemeta'] as $key => $value) :
+            delete_meta($key);
+        endforeach;
+    endif;
+
-    add_meta($post_ID);
-}

trunk/wp-admin/post.php

@@ -118 +118 @@
-
-case 'editpost':
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    if ($_POST['save']) {
@@ -244 +134 @@
-    }
-    header ('Location: ' . $location); // Send user on their way while we keep working
-
-    // Meta Stuff
-    if ($_POST['meta']) :
-        foreach ($_POST['meta'] as $key => $value) :
-            update_meta($key, $value['key'], $value['value']);
-        endforeach;
-    endif;
-
-    if ($_POST['deletemeta']) :
-        foreach ($_POST['deletemeta'] as $key => $value) :
-            delete_meta($key);
-        endforeach;
-    endif;
-
-    add_meta($post_ID);
-
-    // Now it's category time!
-    // First the old categories
-    $old_categories = $wpdb->get_col("SELECT category_id FROM $wpdb->post2cat WHERE post_id = $post_ID");
-    
-    // Delete any?
-    foreach ($old_categories as $old_cat) {
-        if (!in_array($old_cat, $post_categories)) // If a category was there before but isn't now
-            $wpdb->query("DELETE FROM $wpdb->post2cat WHERE category_id = $old_cat AND post_id = $post_ID LIMIT 1");
-    }
-    
-    // Add any?
-    foreach ($post_categories as $new_cat) {
-        if (!in_array($new_cat, $old_categories))
-            $wpdb->query("INSERT INTO $wpdb->post2cat (post_id, category_id) VALUES ($post_ID, $new_cat)");
-    }
-
-    if ($prev_status != 'publish' && $post_status == 'publish')
-        do_action('private_to_published', $post_ID);
-
-    do_action('edit_post', $post_ID);
-
-    if ($post_status == 'publish') {
-        do_action('publish_post', $post_ID);
-        do_trackbacks($post_ID);
-        do_enclose( $content, $post_ID );
-        if ( get_option('default_pingback_flag') )
-            pingback($content, $post_ID);
-    }
-
-    if ($post_status == 'static') {
-        generate_page_rewrite_rules();
-
-        if ( ! update_post_meta($post_ID, '_wp_page_template',  $_POST['page_template'])) {
-            add_post_meta($post_ID, '_wp_page_template',  $_POST['page_template'], true);
-        }
-    }
-
-    exit();

trunk/wp-includes/functions-post.php

@@ -8 +8 @@
-function wp_insert_post($postarr = array()) {
-    global $wpdb, $allowedtags, $user_ID;
-
+
-    // export array as variables
-    extract($postarr);
+
+    // Are we updating or creating?
+    $update = false;
+    if ( !empty($ID) ) {
+        $update = true;
+        $post = & get_post($ID);
+        $previous_status = $post->post_status;
+    }
-
-    // Get the basics.
@@ -32 +40 @@
-        $post_status = 'draft';
-    
-
-
-
+
+
+
+
+
+
+
-
-    // Create a valid post name.  Drafts are allowed to have an empty
@@ -57 +69 @@
-        $post_pingback = get_option('default_pingback_flag');
-
-rackback_url
-rackback_url = preg_replace('|\s+|', "\n", $trackback_url
+o_ping
+o_ping = preg_replace('|\s+|', "\n", $to_ping
-    else
-rackback_url
+o_ping
-    
-    if ( isset($post_parent) )
@@ -88 +100 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            (ID, post_author, post_date, post_date_gmt, post_content, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping, post_modified, post_modified_gmt, post_parent, menu_order)
-            VALUES
-rackback_url', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order')
-       ";
+o_ping', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order')";
+}
-    
-    $result = $wpdb->query($postquery);
-
+
+
+
+
-
-    // Set GUID
-
+
+
-    
-    wp_set_post_cats('', $post_ID, $post_category);
-
-
-
+
+
+
+
+
+
+
-    if ($post_status == 'publish') {
-        do_action('publish_post', $post_ID);
@@ -111 +154 @@
-        do_trackbacks($post_ID);
-    }   else if ($post_status == 'static') {
+        generate_page_rewrite_rules();
+
-        if ( empty($page_template) )
-            $page_template = 'Default Template';
-
-
+
+
+
-    }
-
@@ -124 +170 @@
-    global $wpdb;
-
-
-
+
-    
-    // Set categories
-    if($mode == OBJECT) {
-resul
+pos
-    } 
-    else {
-resul
-
-
-resul
+pos
+
+
+pos
-}
-
@@ -155 +200 @@
-    global $wpdb;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-