← Back to branch summary

~canonical-sysadmins/wordpress/5.1

« back to all changes in this revision

Viewing changes to wp-includes/customize/class-wp-customize-nav-menu-setting.php

  • Committer: Nick Moffitt
  • Date: 2016-04-14 10:43:32 UTC
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: nick.moffitt@canonical.com-20160414104332-61kvsia27qpmjquk
new upstream release 4.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/customize/class-wp-customize-nav-menu-setting.php
513
513
                        $menu_data['menu-name'] = $value['name'];
514
514
 
515
515
                        $menu_id = $is_placeholder ? 0 : $this->term_id;
516
 
                        $r = wp_update_nav_menu_object( $menu_id, $menu_data );
 
516
                        $r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
517
517
                        $original_name = $menu_data['menu-name'];
518
518
                        $name_conflict_suffix = 1;
519
519
                        while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
520
520
                                $name_conflict_suffix += 1;
521
521
                                /* translators: 1: original menu name, 2: duplicate count */
522
522
                                $menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
523
 
                                $r = wp_update_nav_menu_object( $menu_id, $menu_data );
 
523
                                $r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
524
524
                        }
525
525
 
526
526
                        if ( is_wp_error( $r ) ) {