Changeset 10525 for trunk/wp-includes/link-template.php

Timestamp:

02/08/2009 01:38:02 PM (18 years ago)

Author:

azaozz

Message:

Fix permalink editor for pages, hide "View Post" button while editing permalink, fixes #9040

File:

• trunk/wp-includes/link-template.php (modified) (5 diffs)

trunk/wp-includes/link-template.php

@@ -93 +93 @@
         );
 
-        if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter )
+        if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter ) {
                 $post = $id;
-        else
+                $sample = true;
+        } else {
                 $post = &get_post($id);
+                $sample = false;
+        }
 
         if ( empty($post->ID) ) return false;
 
         if ( $post->post_type == 'page' )
-                return get_page_link($post->ID, $leavename);
+                return get_page_link($post->ID, $leavename, $sample);
         elseif ($post->post_type == 'attachment')
                 return get_attachment_link($post->ID);
@@ -178 +181 @@
  *
  * @param int $id Optional. Post ID.
- * @param bool $leavename Optional, defaults to false. Whether to keep post name or page name.
- * @return string
- */
-function get_page_link($id = false, $leavename = false) {
+ * @param bool $leavename Optional, defaults to false. Whether to keep page name.
+ * @param bool $sample Optional, defaults to false. Is it a sample permalink.
+ * @return string
+ */
+function get_page_link( $id = false, $leavename = false, $sample = false ) {
         global $post;
 
@@ -191 +195 @@
                 $link = get_option('home');
         else
-                $link = _get_page_link( $id , $leavename );
+                $link = _get_page_link( $id , $leavename, $sample );
 
         return apply_filters('page_link', $link, $id);
@@ -206 +210 @@
  * @param int $id Optional. Post ID.
  * @param bool $leavename Optional. Leave name.
- * @return string
- */
-function _get_page_link( $id = false, $leavename = false ) {
+ * @param bool $sample Optional. Sample permalink.
+ * @return string
+ */
+function _get_page_link( $id = false, $leavename = false, $sample = false ) {
         global $post, $wp_rewrite;
 
@@ -218 +223 @@
         $pagestruct = $wp_rewrite->get_page_permastruct();
 
-        if ( '' != $pagestruct && isset($post->post_status) && 'draft' != $post->post_status ) {
+        if ( '' != $pagestruct && ( ( isset($post->post_status) && 'draft' != $post->post_status ) || $sample ) ) {
                 $link = get_page_uri($id);
                 $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);