Ticket #37916: 37916.diff

src/wp-includes/functions.php

@@ -4954 +4954 @@
  *
  * @since 3.3.0
  * @since 4.3.0 Added 'webcal' to the protocols array.
+ * @since 4.7.0 Added 'urn' to the protocols array.
  *
  * @see wp_kses()
  * @see esc_url()
@@ -4962 +4963 @@
  *
  * @return array Array of allowed protocols. Defaults to an array containing 'http', 'https',
  *               'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet',
- *               'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', and 'webcal'.
+ *               'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal', and 'urn'.
  */
 function wp_allowed_protocols() {
         static $protocols = array();
 
         if ( empty( $protocols ) ) {
-                $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal' );
+                $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal', 'urn' );
 
                 /**
                  * Filters the list of protocols allowed in HTML attributes.

src/wp-includes/class-wp-customize-nav-menus.php

@@ -764 +764 @@
                         wp_send_json_error( 'missing_params', 400 );
                 }
 
+                if ( ! apply_filters( 'customize_create_nav_menu_content', true ) ) {
+                        wp_send_json_error( 'nav_menu_creation_disabled', 400 );
+                }
+
                 $params = wp_array_slice_assoc(
                         array_merge(
                                 array(
@@ -941 +945 @@
                                         <div class="accordion-section-content">
                                                 <?php if ( 'post_type' === $available_item_type['type'] ) : ?>
                                                         <?php $post_type_obj = get_post_type_object( $available_item_type['object'] ); ?>
-                                                        <?php if ( current_user_can( $post_type_obj->cap->create_posts ) && current_user_can( $post_type_obj->cap->publish_posts ) ) : ?>
+                                                        <?php if ( current_user_can( $post_type_obj->cap->create_posts ) && current_user_can( $post_type_obj->cap->publish_posts ) && apply_filters( 'customize_create_nav_menu_content', true ) ) : ?>
                                                                 <div class="new-content-item">
                                                                         <input type="text" class="create-item-input" placeholder="<?php echo esc_attr( $post_type_obj->labels->add_new_item ); ?>">
                                                                         <button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>