Changeset 22129

Timestamp:

10/07/2012 03:44:30 AM (12 years ago)

Author:

nacin

Message:

Pass the screen context directly to get_sample_permalink_html(). see #16379.

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (3 diffs)
• wp-admin/js/sample-permalink.js (modified) (1 diff)
• wp-admin/js/sample-permalink.min.js (added)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

@@ -1299 +1299 @@
     $title = isset($_POST['new_title'])? $_POST['new_title'] : '';
     $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : null;
-    wp_die( get_sample_permalink_html( $post_id, $title, $slug ) );
+    $screen = isset( $_POST['screen'] ) ? $_POST['screen'] : 'post';
+    wp_die( get_sample_permalink_html( $post_id, $title, $slug, $screen ) );
 }
 

trunk/wp-admin/includes/post.php

@@ -1048 +1048 @@
 
 /**
- * sample permalink html
- *
- * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
+ * Returns the HTML of the sample permalink slug editor.
  *
  * @since 2.5.0
  *
  * @param int|object $id Post ID or post object.
- * @param string $new_title (optional) New title
- * @param string $new_slug (optional) New slug
- * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
- */
-function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
+ * @param string $new_title Optional. New title.
+ * @param string $new_slug Optional. New slug.
+ * @param string|WP_Screen $screen Optional. Screen where the editor is being shown.
+ * @return string The HTML of the sample permalink slug editor.
+ */
+function get_sample_permalink_html( $id, $new_title = null, $new_slug = null, $screen = null ) {
     global $wpdb;
     $post = get_post($id);
 
-    $context = isset( $_POST['context'] ) ? $_POST['context'] : get_current_screen()->id;
     list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
+
+    if ( isset( $screen ) )
+        $screen = convert_to_screen( $screen );
+    else
+        $screen = get_current_screen();
 
     if ( 'publish' == get_post_status( $post ) ) {
@@ -1075 +1078 @@
 
     if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
-        if ( 'options-reading' == $context )
+        if ( 'options-reading' == $screen->id )
             return '';
         $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
@@ -1105 +1108 @@
     $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
     $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
-    $return  = ( 'options-reading' == $context ) ? __( 'Located at' ) . "\n" : '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+    $return  = ( 'options-reading' == $screen->id ) ? __( 'Located at' ) . "\n" : '<strong>' . __( 'Permalink:' ) . "</strong>\n";
     $return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
     $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
     $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
     $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
-    if ( isset( $view_post ) && 'options-reading' != $context )
+    if ( isset( $view_post ) && 'options-reading' != $screen->id )
         $return .= "<span id='view-post-btn'><a href='$view_link' class='button button-small'>$view_post</a></span>\n";
 

trunk/wp-admin/js/sample-permalink.js

@@ -26 +26 @@
                 new_slug: new_slug,
                 new_title: $('#title').val(),
-                context: pagenow,
+                screen: pagenow,
                 samplepermalinknonce: $('#samplepermalinknonce').val()
             }, function(data) {

trunk/wp-includes/script-loader.php

@@ -370 +370 @@
         $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
 
-        $scripts->add( 'sample-permalink', "/wp-admin/js/sample-permalink.js", array(), false, 1 );
+        $scripts->add( 'sample-permalink', "/wp-admin/js/sample-permalink$suffix.js", array(), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'sample-permalink', 'samplePermalinkL10n', array(
             'ok' => __('OK'),