Changeset 6955
- Timestamp:
- 02/21/2008 08:19:34 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/edit-form-advanced.php
r6954 r6955 86 86 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?> 87 87 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> 88 <?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?> 88 89 <?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?> 89 <?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>90 90 </div> 91 91 -
trunk/wp-admin/edit-page-form.php
r6953 r6955 52 52 <div class="inside"> 53 53 <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" /> 54 <?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?> 55 <div id="edit-slug-box"> 56 <?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : 57 echo $sample_permalink_html; 58 endif; ?> 59 </div> 54 60 </div> 55 61 </div> … … 61 67 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> 62 68 <?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?> 69 <?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?> 63 70 </div> 64 71 -
trunk/wp-admin/includes/post.php
r6954 r6955 594 594 $post = &get_post($id); 595 595 list($permalink, $post_name) = get_sample_permalink($post->ID, $new_slug); 596 if (false === strpos($permalink, '%postname%') ) {596 if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) { 597 597 return ''; 598 598 } … … 604 604 } 605 605 $post_name_html = '<span id="editable-post-name" title="'.$title.'">'.$post_name_abridged.'</span><span id="editable-post-name-full">'.$post_name.'</span>'; 606 $display_link = str_replace( '%postname%', $post_name_html, $permalink);606 $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink); 607 607 $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $display_link . "</span>\n"; 608 608 $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug" onclick="edit_permalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n"; -
trunk/wp-admin/js/page.js
r6904 r6955 2 2 add_postbox_toggles('page'); 3 3 make_slugedit_clickable(); 4 5 // hide advanced slug field 6 jQuery('#pageslugdiv').hide(); 4 7 5 8 jQuery('#timestamp').css('display', 'none'); -
trunk/wp-admin/js/post.js
r6904 r6955 69 69 // Editable slugs 70 70 make_slugedit_clickable(); 71 72 // hide advanced slug field 73 jQuery('#slugdiv').hide(); 71 74 72 75 jQuery('#tags-input').hide(); -
trunk/wp-includes/js/autosave.js
r6954 r6955 13 13 jQuery("#post #publish").click(function() { jQuery.cancel(autosavePeriodical); }); 14 14 jQuery("#post #deletepost").click(function() { jQuery.cancel(autosavePeriodical); }); 15 16 // Autosave early on for a new post 17 jQuery("#content").keypress(function() { 18 if ( 1 === ( jQuery(this).val().length % 15 ) && 1 > parseInt(jQuery("#post_ID").val(),10) ) 19 setTimeout(autosave, 5000); 20 }); 15 21 } 16 22 addLoadEvent(autosave_start_timer) … … 133 139 134 140 post_data["content"] = jQuery("#content").val(); 141 if ( jQuery('#post_name').val() ) 142 post_data["post_name"] = jQuery('#post_name').val(); 135 143 136 144 if(post_data["post_title"].length==0 || post_data["content"].length==0 || post_data["post_title"] + post_data["content"] == autosaveLast) { -
trunk/wp-includes/link-template.php
r6777 r6955 64 64 65 65 if ( $post->post_type == 'page' ) 66 return get_page_link($post->ID );66 return get_page_link($post->ID, $leavename); 67 67 elseif ($post->post_type == 'attachment') 68 68 return get_attachment_link($post->ID); … … 119 119 120 120 // Respects page_on_front. Use this one. 121 function get_page_link($id = false ) {121 function get_page_link($id = false, $leavename = false) { 122 122 global $post; 123 123 … … 129 129 $link = get_option('home'); 130 130 else 131 $link = _get_page_link( $id );131 $link = _get_page_link( $id , $leavename ); 132 132 133 133 return apply_filters('page_link', $link, $id); … … 135 135 136 136 // Ignores page_on_front. Internal use only. 137 function _get_page_link( $id = false ) {137 function _get_page_link( $id = false, $leavename = false ) { 138 138 global $post, $wp_rewrite; 139 139 … … 147 147 if ( '' != $pagestruct && isset($post->post_status) && 'draft' != $post->post_status ) { 148 148 $link = get_page_uri($id); 149 $link = str_replace('%pagename%', $link, $pagestruct);149 $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct); 150 150 $link = get_option('home') . "/$link"; 151 151 $link = user_trailingslashit($link, 'page'); -
trunk/wp-includes/script-loader.php
r6954 r6955 45 45 $this->add( 'autosave', '/wp-includes/js/autosave.js', array('jquery', 'schedule'), '20080221'); 46 46 $this->localize( 'autosave', 'autosaveL10n', array( 47 'autosaveInterval' => apply_filters('autosave_interval', ' 120'),47 'autosaveInterval' => apply_filters('autosave_interval', '60'), 48 48 'errorText' => __('Error: %response%'), 49 49 'failText' => __('Error: Autosave Failed.'), … … 149 149 'cancel' => __('Cancel'), 150 150 ) ); 151 $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080 128' );151 $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080221' ); 152 152 $this->localize( 'post', 'postL10n', array( 153 153 'tagsUsed' => __('Tags used on this post:'),
Note: See TracChangeset
for help on using the changeset viewer.