Changeset 863
- Timestamp:
- 02/11/2004 04:51:19 AM (21 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/options-permalink.php
r836 r863 178 178 $catmatch = $front . 'category/'; 179 179 $catmatch = preg_replace('|^/+|', '', $catmatch); 180 $authormatch = $front . 'author/'; 181 $authormatch = preg_replace('|^/+|', '', $authormatch); 180 182 181 183 ?> … … 188 190 RewriteRule ^<?php echo $catmatch; ?>(.*)/<?php echo $feedregex ?>$ <?php echo $site_root; ?>wp-feed.php?category_name=$1&feed=$2 [QSA] 189 191 RewriteRule ^<?php echo $catmatch; ?>?(.*) <?php echo $site_root; ?>index.php?category_name=$1 [QSA] 192 RewriteRule ^<?php echo $authormatch; ?>(.*)/<?php echo $feedregex ?>$ <?php echo $site_root; ?>wp-feed.php?author_name=$1&feed=$2 [QSA] 193 RewriteRule ^<?php echo $authormatch; ?>?(.*) <?php echo $site_root; ?>index.php?author_name=$1 [QSA] 190 194 RewriteRule ^<?php echo $sitefeedmatch; ?> <?php echo $sitefeedquery ?> [QSA] 191 195 RewriteRule ^<?php echo $sitecommentfeedmatch; ?> <?php echo $sitecommentfeedquery ?> [QSA]</textarea> -
trunk/wp-admin/upgrade-functions.php
r855 r863 681 681 $wpdb->query("ALTER TABLE `$tableposts` CHANGE `comment_status` `comment_status` ENUM( 'open', 'closed', 'registered_only' ) DEFAULT 'open' NOT NULL"); 682 682 683 maybe_add_column($tableusers, 'user_nicename', "ALTER TABLE `$tableusers` ADD `user_nicename` VARCHAR(50) DEFAULT '' NOT NULL ;"); 684 685 // Set user_nicename. 686 $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $tableusers"); 687 foreach ($users as $user) { 688 if ('' == $user->user_nicename) { 689 $newname = sanitize_title($user->user_nickname); 690 $wpdb->query("UPDATE $tableusers SET user_nicename = '$newname' WHERE ID = '$user->ID'"); 691 } 692 } 693 683 694 // Convert passwords to MD5 and update table appropiately 684 695 $query = 'DESCRIBE '.$tableusers.' user_pass'; -
trunk/wp-admin/users.php
r850 r863 67 67 $pass1 = addslashes(stripslashes($pass1)); 68 68 $user_nickname = addslashes(stripslashes($user_nickname)); 69 $user_nicename = sanitize_title($user_nickname); 69 70 $user_firstname = addslashes(stripslashes($user_firstname)); 70 71 $user_lastname = addslashes(stripslashes($user_lastname)); … … 72 73 73 74 $result = $wpdb->query("INSERT INTO $tableusers 74 (user_login, user_pass, user_nickname, user_email, user_ip, user_domain, user_browser, dateYMDhour, user_level, user_idmode, user_firstname, user_lastname )75 (user_login, user_pass, user_nickname, user_email, user_ip, user_domain, user_browser, dateYMDhour, user_level, user_idmode, user_firstname, user_lastname, user_nicename) 75 76 VALUES 76 ('$user_login', MD5('$pass1'), '$user_nickname', '$user_email', '$user_ip', '$user_domain', '$user_browser', '$now', '$new_users_can_blog', 'nickname', '$user_firstname', '$user_lastname' )");77 ('$user_login', MD5('$pass1'), '$user_nickname', '$user_email', '$user_ip', '$user_domain', '$user_browser', '$now', '$new_users_can_blog', 'nickname', '$user_firstname', '$user_lastname', '$user_nicename')"); 77 78 78 79 if ($result == false) { -
trunk/wp-blog-header.php
r836 r863 11 11 require($curpath.'/wp-config.php'); 12 12 13 $wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'name', 'category_name', 'feed' );13 $wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'name', 'category_name', 'feed', 'author_name'); 14 14 15 15 for ($i=0; $i<count($wpvarstoreset); $i += 1) { … … 226 226 } 227 227 228 // Author stuff for nice URIs 229 230 if ('' != $author_name) { 231 if (stristr($author_name,'/')) { 232 $author_name = explode('/',$author_name); 233 if ($author_name[count($author_name)-1]) { 234 $author_name = $author_name[count($author_name)-1];#no trailing slash 235 } else { 236 $author_name = $author_name[count($author_name)-2];#there was a trailling slash 237 } 238 } 239 $author_name = preg_replace('|[^a-z0-9-]|', '', strtolower($author_name)); 240 $author = $wpdb->get_var("SELECT ID FROM $tableusers WHERE user_nicename='".$author_name."'"); 241 $whichauthor .= ' AND (post_author = '.intval($author).')'; 242 } 243 228 244 $where .= $search.$whichcat.$whichauthor; 229 245
Note: See TracChangeset
for help on using the changeset viewer.