Changeset 12284 for trunk/wp-includes/post.php

Timestamp:

11/26/2009 11:29:54 AM (17 years ago)

Author:

azaozz

Message:

Fix notices and phpdoc, props hakre, fixes #10758

File:

• trunk/wp-includes/post.php (modified) (4 diffs)

trunk/wp-includes/post.php

@@ -1942 +1942 @@
  * Given the desired slug and some post details computes a unique slug for the post.
  *
+ * @global wpdb $wpdb 
+ * @global WP_Rewrite $wp_rewrite 
  * @param string $slug the desired slug (post_name)
  * @param integer $post_ID
@@ -1954 +1956 @@
 
         global $wpdb, $wp_rewrite;
+
+        $feeds = $wp_rewrite->feeds;
+        if ( !is_array($feeds) )
+                $feeds = array();
+
         $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page'));
         if ( 'attachment' == $post_type ) {
@@ -1960 +1967 @@
                 $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
 
-                if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
+                if ( $post_name_check || in_array($slug, $feeds) ) {
                         $suffix = 2;
                         do {
@@ -1975 +1982 @@
                 $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent));
 
-                if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
+                if ( $post_name_check || in_array($slug, $feeds) ) {
                         $suffix = 2;
                         do {