Ticket #21492: 21492.patch

src/wp-admin/js/customize-controls.js

@@ -961 +961 @@
                         });
                 });
 
+                // Handle equal Page on Front settings
+                $.each( [ 'page_on_front', 'page_for_posts' ], function( i, settingId ) {
+                        api.control( settingId, function( control ) {
+                                var other = 0;
+
+                                control.setting.bind( function( to ) {
+                                        other = ( settingId === 'page_on_front' ) ? api( 'page_for_posts' ).get() : api( 'page_on_front' ).get();
+
+                                        if ( to === other ) {
+                                                control.container.parent().append(
+                                                        '<li class="customize-control show-on-front-warning">' +
+                                                        '<div class="error">' + api.l10n.equalPagesWarning + '</div>' +
+                                                        '</li>'
+                                                );
+                                        } else {
+                                                control.container.parent().find( '.show-on-front-warning' ).remove();
+                                        }
+                                });
+                        });
+                });
+
                 // Handle header image data
                 api.control( 'header_image', function( control ) {
                         control.setting.bind( function( to ) {

src/wp-includes/script-loader.php

@@ -373 +373 @@
 
                 // Used for overriding the file types allowed in plupload.
                 'allowedFiles' => __( 'Allowed Files' ),
+                // Used for Front Page setting.
+                'equalPagesWarning' => __( '<strong>Warning:</strong> these pages should not be the same!' ),
         ) );
 
         $scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );