Ticket #28874: 28874.patch

src/wp-includes/rewrite.php

@@ -1180 +1180 @@
          * Retrieve the comment feed permalink structure.
          *
          * The permalink structure is root property, comment base property, feed
-         * base and finally '/%feed%'. Will set the comment_feed_structure property
+         * base and finally '/%feed%'. Will set the comments_feed_structure property
          * and then return it without attempting to set the value again.
          *
          * @since 1.5.0
@@ -1189 +1189 @@
          * @return string|bool False if not found. Permalink structure string.
          */
         public function get_comment_feed_permastruct() {
-                if ( isset($this->comment_feed_structure) )
-                        return $this->comment_feed_structure;
+                if ( isset($this->comments_feed_structure) )
+                        return $this->comments_feed_structure;
 
                 if (empty($this->permalink_structure)) {
-                        $this->comment_feed_structure = '';
+                        $this->comments_feed_structure = '';
                         return false;
                 }
 
-                $this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
+                $this->comments_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
 
-                return $this->comment_feed_structure;
+                return $this->comments_feed_structure;
         }
 
         /**
@@ -2085 +2085 @@
                 unset($this->page_structure);
                 unset($this->search_structure);
                 unset($this->feed_structure);
-                unset($this->comment_feed_structure);
+                unset($this->comments_feed_structure);
                 $this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
 
                 // Enable generic rules for pages if permalink structure doesn't begin with a wildcard.