Ticket #55176: 55176.3.diff

src/wp-includes/category-template.php

@@ -555 +555 @@
         }
 
         // Descendants of exclusions should be excluded too.
-        if ( true == $parsed_args['hierarchical'] ) {
+        if ( true === $parsed_args['hierarchical'] ) {
                 $exclude_tree = array();
 
                 if ( $parsed_args['exclude_tree'] ) {

src/wp-includes/post.php

@@ -2908 +2908 @@
  */
 function stick_post( $post_id ) {
         $post_id  = (int) $post_id;
-        $stickies = get_option( 'sticky_posts' );
+        $stickies = get_option( 'sticky_posts', array() );
         $updated  = false;
 
-        if ( ! is_array( $stickies ) ) {
-                $stickies = array( $post_id );
-        } else {
+        if ( $stickies ) {
                 $stickies = array_unique( array_map( 'intval', $stickies ) );
         }