Ticket #24354: 24354.2.diff

tests/phpunit/tests/taxonomy.php

@@ -234 +234 @@
                 );
                 $this->assertEquals( 0, wp_insert_category( $cat, false ) );
         }
+
+        /**
+         *      @ticket 24354
+         */
+        function test_cat_has_ampersand() {
+                $name = 'News & Press';
+                $expected = wp_create_category( $name );
+                $this->assertEquals( $expected, get_cat_id( $name ) );
+        }
 }

src/wp-includes/category.php

@@ -168 +168 @@
  * @return int 0, if failure and ID of category on success.
  */
 function get_cat_ID( $cat_name ) {
+        $cat_name = _wp_specialchars( $cat_name ); // get_term_by expects $cat_name to be escaped
         $cat = get_term_by( 'name', $cat_name, 'category' );
         if ( $cat )
                 return $cat->term_id;