Changeset 1933

Timestamp:

12/09/2004 02:40:35 AM (22 years ago)

Author:

rboren

Message:

get_author_permastruct()

Location:

trunk/wp-includes

Files:

• classes.php (modified) (4 diffs)
• template-functions-author.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -703 +703 @@
         var $category_base;
         var $category_structure;
+        var $author_structure;
         var $date_structure;
         var $front;
@@ -878 +879 @@
         }
 
+        function get_author_permastruct() {
+                if (isset($this->author_structure)) {
+                        return $this->author_structure;
+                }
+
+    if (empty($this->permalink_structure)) {
+                        $this->author_structure = '';
+                        return false;
+                }
+
+                $this->author_structure = $this->front . 'author/%author%';
+
+                return $this->author_structure;
+        }
+
         function add_rewrite_tag($tag, $pattern, $query) {
                 $this->rewritecode[] = $tag;
@@ -1005 +1021 @@
 
                 // Authors
-                $author_structure = $this->front . 'author/%author%';
-                $author_rewrite = $this->generate_rewrite_rules($author_structure);
+                $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct());
 
                 // Pages
@@ -1079 +1094 @@
                 $this->category_base = get_settings('category_base');
                 unset($this->category_structure);
+                unset($this->author_structure);
                 unset($this->date_structure);           
         }

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

@@ -78 +78 @@
 
 function get_author_link($echo = false, $author_id, $author_nicename) {
-    global $wpdb, $post, $querystring_start, $querystring_equal, $cache_userdata;
+        global $wpdb, $wp_rewrite, $post, $querystring_start, $querystring_equal, $cache_userdata;
     $auth_ID = $author_id;
-    $permalink_structure = get_settings('permalink_structure');
+    $link = $wp_rewrite->get_author_permastruct();
     
-    if ('' == $permalink_structure) {
+    if (empty($link)) {
         $file = get_settings('home') . '/' . get_settings('blogfilename');
         $link = $file.$querystring_start.'author'.$querystring_equal.$auth_ID;
     } else {
         if ('' == $author_nicename) $author_nicename = $cache_userdata[$author_id]->author_nicename;
-        // Get any static stuff from the front
-        $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
-        $link = get_settings('home') . $front . 'author/';
-        $link .= $author_nicename . '/';
+                                $link = str_replace('%author%', $author_nicename, $link);
+                                $link = get_settings('home') . trailingslashit($link);
     }