Changeset 1752 for trunk/wp-includes/template-functions-links.php

Timestamp:

10/06/2004 02:18:37 AM (22 years ago)

Author:

rboren

Message:

Page/subpage URIs.

File:

• trunk/wp-includes/template-functions-links.php (modified) (2 diffs)

trunk/wp-includes/template-functions-links.php

@@ -50 +50 @@
     }
 
+    if ($idpost->post_status == 'static') {
+        return get_page_link();
+    }
+    
     $permalink = get_settings('permalink_structure');
 
     if ('' != $permalink) {
-        if ($idpost->post_status == 'static')
-            $permalink = page_permastruct();
-
         $unixtime = strtotime($idpost->post_date);
 
@@ -79 +80 @@
     } else { // if they're not using the fancy permalink option
         $permalink = get_settings('home') . '/' . get_settings('blogfilename') . '?p=' . $idpost->ID;
-        if ($idpost->post_status == 'static')
-            $permalink .=  '&static=1';
         return $permalink;
     }
+}
+
+function get_page_link($id = false) {
+    global $post;
+
+    if (! $id) {
+        $id = $post->ID;
+    }
+
+    $permalink = get_settings('permalink_structure');
+
+    if ('' != $permalink) {
+        $link = get_page_uri($id);
+        $link = get_settings('home') . "/$link/";
+    } else {
+        $link = get_settings('home') . "/index.php?p=$id&static=1";
+    }
+
+    return $link;
 }