Changeset 24373

Timestamp:

05/27/2013 01:02:10 AM (13 years ago)

Author:

SergeyBiryukov

Message:

Fix switching post formats when JavaScript is disabled. props kovshenin. see #24360.

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (1 diff)
• edit-form-advanced.php (modified) (2 diffs)

trunk/wp-admin/admin-header.php

@@ -88 +88 @@
 if ( isset( $post ) && is_a( $post, 'WP_Post' ) && post_type_supports( get_post_type(), 'post-formats' ) ) {
     $post_format = get_post_format();
-    if ( ! $post_format ) {
+
+    if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
+        $post_format = $_REQUEST['format'];
+
+    if ( ! $post_format )
         $post_format = 'standard';
-
-        if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
-            $post_format = $_REQUEST['format'];
-    }
 
     $admin_body_class .= ' wp-format-' . $post_format;

trunk/wp-admin/edit-form-advanced.php

@@ -137 +137 @@
     $post_format = get_post_format();
 
-    if ( ! $post_format ) {
+    if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
+        $post_format = $_REQUEST['format'];
+
+    if ( ! $post_format )
         $post_format = 'standard';
-
-        if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
-            $post_format = $_REQUEST['format'];
-    }
 
     $format_class = " class='wp-format-{$post_format}'";
@@ -186 +185 @@
         }
 
-        $post_format_options .= '<a ' . $class . ' href="?format=' . $slug . '" data-description="' . $attr['description'] . '" data-wp-format="' . $slug . '" title="' . ucfirst( $slug ) . '"><div class="' . $slug . '"></div><span class="post-format-title">' . ucfirst( $slug ) . '</span></a>';
+        $url = add_query_arg( 'format', $slug );
+
+        $post_format_options .= '<a ' . $class . ' href="' . esc_url( $url ) . '" data-description="' . $attr['description'] . '" data-wp-format="' . $slug . '" title="' . ucfirst( $slug ) . '"><div class="' . $slug . '"></div><span class="post-format-title">' . ucfirst( $slug ) . '</span></a>';
     }