Changeset 2647

Timestamp:

06/18/05 19:08:38 (4 years ago)

Author:

ryan

Message:

Consolidate post creation code into wp_insert_post().

Files:

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

trunk/wp-admin/admin-functions.php

@@ -1 +1 @@
-<?php
+
+// Creates a new post from the "Write Post" form.
+function write_post() {
+    global $user_ID;
+
+    if ( !user_can_create_draft($user_ID) )
+        die( __('You are not allowed to create posts or drafts on this blog.') );
+
+    // Rename.
+    $_POST['post_content']  = $_POST['content'];
+    $_POST['post_excerpt']  = $_POST['excerpt'];
+    $_POST['post_parent'] = $_POST['parent_id'];
+
+    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_author) )
+        die( __('You cannot post as this user.') );
+    
+    if ( 'publish' == $_POST['post_status'] && (!user_can_create_post($user_ID)) )
+        $_POST['post_status'] = 'draft';
+    
+    // What to do based on which button they pressed
+    if ('' != $_POST['saveasdraft']) $_POST['post_status'] = 'draft';
+    if ('' != $_POST['saveasprivate']) $_POST['post_status'] = 'private';
+    if ('' != $_POST['publish']) $_POST['post_status'] = 'publish';
+    if ('' != $_POST['advanced']) $_POST['post_status'] = 'draft';
+    if ('' != $_POST['savepage']) $_POST['post_status'] = 'static';
+        
+    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");
+    } 
+
+    // Create the post.
+    $post_ID = wp_insert_post($_POST);
+    add_meta($post_ID);
+}
-
-function url_shorten ($url) {

trunk/wp-admin/post.php

@@ -31 +31 @@
-case 'post':
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    if (!empty($_POST['mode'])) {
-    switch($_POST['mode']) {
@@ -168 +56 @@
-        $location = "post.php?action=edit&post=$post_ID";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    exit();
-    break;

trunk/wp-includes/functions-post.php

@@ -7 +7 @@
- */
-function wp_insert_post($postarr = array()) {
-
+, $user_ID
-    
-    // export array as variables
-    extract($postarr);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    // Make sure we set a valid category
-    if (0 == count($post_category) || !is_array($post_category)) {
-        $post_category = array($post_default_category);
-    }
-
-    $post_cat = $post_category[0];
+
+    if ( empty($post_author) )
+        $post_author = $user_ID;
+
+    if ( empty($post_status) )
+        $post_status = 'draft';
+    
+    // Get the next post ID.
+    $id_result = $wpdb->get_row("SHOW TABLE STATUS LIKE '$wpdb->posts'");
+    $post_ID = $id_result->Auto_increment;
+
+    // Create a valid post name.  Drafts are allowed to have an empty
+    // post name.
+    if ( empty($post_name) ) {
+        if ( 'draft' != $post_status )
+            $post_name = sanitize_title($post_title, $post_ID);
+    } else {
+        $post_name = sanitize_title($post_name, $post_ID);
+    }
-    
-    if (empty($post_date))
-        $post_date = current_time('mysql');
-    // Make sure we have a good gmt date:
-    if (empty($post_date_gmt)) 
-
+
+
-    if (empty($comment_status))
-        $comment_status = get_settings('default_comment_status');
-    if (empty($ping_status))
-        $ping_status = get_settings('default_ping_status');
-
+
+
+
+
+
+
+
+
+
+
+
-        $post_parent = 0;
+
+    if ( isset($menu_order) )
+        $menu_order = (int) $menu_order;
+    else
+        $menu_order = 0;
+
+    if ( !isset($post_password) )
+        $post_password = '';
-
-    if ('publish' == $post_status) {
@@ -51 +88 @@
-    }
-
-
-
-
-
-
+
+
+
+
+
+
+
-    $post_ID = $wpdb->insert_id;
-
@@ -62 +101 @@
-    
-    wp_set_post_cats('', $post_ID, $post_category);
+
+    $wpdb->query("UPDATE $wpdb->posts SET guid = '" . get_permalink($post_ID) . "' WHERE ID = '$post_ID'");
-    
-    if ($post_status == 'publish') {
-        do_action('publish_post', $post_ID);
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    // Return insert_id if we got a good result, otherwise return zero.