Changeset 6221

Timestamp:

10/10/2007 10:01:40 PM (17 years ago)

Author:

markjaquith

Message:

Introducing db_insert() and db_update(), with immediate usage in wp_insert_post(). fixes #5178

Location:

trunk/wp-includes

Files:

• post.php (modified) (1 diff)
• wp-db.php (modified) (1 diff)

trunk/wp-includes/post.php

@@ -1369 +1369 @@
         $pinged = '';
 
+    // expected_slashed (everything!)
+    $data = array();
+    foreach ( 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_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid') as $f )
+        $data[$f] = stripslashes($$f);
+    unset($f);
+
     if ($update) {
-        // expected_slashed (everything!)
-        $wpdb->query(
-            "UPDATE $wpdb->posts SET
-            post_author = '$post_author',
-            post_date = '$post_date',
-            post_date_gmt = '$post_date_gmt',
-            post_content = '$post_content',
-            post_content_filtered = '$post_content_filtered',
-            post_title = '$post_title',
-            post_excerpt = '$post_excerpt',
-            post_status = '$post_status',
-            post_type = '$post_type',
-            comment_status = '$comment_status',
-            ping_status = '$ping_status',
-            post_password = '$post_password',
-            post_name = '$post_name',
-            to_ping = '$to_ping',
-            pinged = '$pinged',
-            post_modified = '".current_time('mysql')."',
-            post_modified_gmt = '".current_time('mysql',1)."',
-            post_parent = '$post_parent',
-            menu_order = '$menu_order',
-            post_mime_type = '$post_mime_type',
-            guid = '$guid'
-            WHERE ID = $post_ID");
-    } else {
-        // expected_slashed (everything!)
-        $wpdb->query(
-            "INSERT INTO $wpdb->posts
-            (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_modified, post_modified_gmt, post_parent, menu_order, post_mime_type, guid)
-            VALUES
-            ('$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', '$guid')");
-            $post_ID = (int) $wpdb->insert_id;
+        $wpdb->db_update($wpdb->posts, $data, 'ID', $post_ID);
+    } else {
+        $wpdb->db_insert($wpdb->posts, $data);
+        $post_ID = (int) $wpdb->insert_id;
     }
 
     if ( empty($post_name) ) {
         $post_name = sanitize_title($post_title, $post_ID);
-        // expected_slashed ($post_name)
-        $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_name = '$post_name' WHERE ID = %d", $post_ID));
+        $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_name = '%s' WHERE ID = %d", $post_name, $post_ID));
     }
 

trunk/wp-includes/wp-db.php

@@ -252 +252 @@
 
     /**
+     * Insert an array of data into a table
+     * @param string $table WARNING: not sanitized!
+     * @param array $data should not already be SQL-escaped
+     * @return mixed results of $this->query()
+     */
+    function db_insert($table, $data) {
+        $data = add_magic_quotes($data);
+        $fields = array_keys($data);
+        return $this->query("INSERT INTO $table (`" . implode('`,`',$fields) . "`) VALUES ('".implode("','",$data)."')");
+    }
+
+    /**
+     * Update a row in the table with an array of data
+     * @param string $table WARNING: not sanitized!
+     * @param array $data should not already be SQL-escaped
+     * @param string $where_col the column of the WHERE statement.  WARNING: not sanitized!
+     * @param string $where_val the value of the WHERE statement.  Should not already be SQL-escaped.
+     * @return mixed results of $this->query()
+     */
+    function db_update($table, $data, $where_col, $where_val){
+        $data = add_magic_quotes($data);
+        $bits = array();
+        foreach ( array_keys($data) as $k )
+            $bits[] = "`$k`='$data[$k]'";
+        $where_val = $wpdb->escape($where_val);
+        return $this->query("UPDATE $table SET ".implode(', ',$bits)." WHERE $where_col = '$where_val' LIMIT 1");
+    }
+
+    /**
      * Get one variable from the database
      * @param string $query (can be null as well, for caching, see codex)