Ticket #21492: 21492.2.diff

wp-includes/class-wp-customize-manager.php

@@ -4112 +4112 @@
                 $this->add_setting( 'page_on_front', array(
                         'type'       => 'option',
                         'capability' => 'manage_options',
+                        'validate_callback' => array( $this, '_validate_page_on_front' ),
                 ) );
 
                 $this->add_control( 'page_on_front', array(
@@ -4121 +4122 @@
                         'allow_addition' => true,
                 ) );
 
-                $this->add_setting( 'page_for_posts', array(
-                        'type' => 'option',
-                        'capability' => 'manage_options',
-                ) );
-
                 $this->add_control( 'page_for_posts', array(
                         'label' => __( 'Posts page' ),
                         'section' => 'static_front_page',
@@ -4219 +4215 @@
 
                 return $color;
         }
+        /**
+         * Callback for validating page on front value
+         *
+         * @since 4.7.3
+         *
+         * @param object $validity
+         * @param mixed $value
+         * @access private
+         * @return mixed
+         */
+        public function _validate_page_on_front( $validity, $value ) {
+                $page_for_posts = (int) get_option( 'page_for_posts', 0 );
 
+                $value = (int) $value;
+                if ( 0 === $value ) {
+                        return $validity;
+                }
+                if ( $value === $page_for_posts ) {
+                        // add error message
+                        $validity->add( 'same_id_for_page_for_posts', __( 'Warning: We advise you to chose a different page for your Posts page.' ) );
+                }
+                return $validity;
+        }
+
         /**
          * Callback for validating a background setting value.
          *

wp-includes/js/media/views/attachments/browser.js

@@ -41 +41 @@
                 this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
                 this.controller.on( 'edit:selection', this.editSelection );
                 this.createToolbar();
-                this.createUploader();
-                this.createAttachments();
-                if ( this.options.sidebar ) {
-                        this.createSidebar();
+                // if its open in wp-admin/upload.php show sidebar first
+                if ( 'library' === this.model.id ) {
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
+                        this.createUploader();
+                        this.createAttachments();
+                } else {
+                        // if its open inside a modal (not in wp-admin/upload.php ) show uploader and attachments first
+                        this.createUploader();
+                        this.createAttachments();
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
                 }
                 this.updateContent();
 

wp-includes/js/media-views.js

@@ -3772 +3772 @@
                 this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
                 this.controller.on( 'edit:selection', this.editSelection );
                 this.createToolbar();
-                this.createUploader();
-                this.createAttachments();
-                if ( this.options.sidebar ) {
-                        this.createSidebar();
+                // if its open in wp-admin/upload.php show sidebar first
+                if ( 'library' === this.model.id ) {
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
+                        this.createUploader();
+                        this.createAttachments();
+                } else {
+                        // if its open inside a modal (not in wp-admin/upload.php ) show uploader and attachments first
+                        this.createUploader();
+                        this.createAttachments();
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
                 }
                 this.updateContent();