From rboren at users.sourceforge.net Tue Feb 1 01:04:19 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 01:04:49 2005 Subject: [wp-cvs] wordpress/wp-includes classes.php,1.47,1.48 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26070 Modified Files: classes.php Log Message: Add set method. Index: classes.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** classes.php 26 Jan 2005 22:46:39 -0000 1.47 --- classes.php 1 Feb 2005 01:04:08 -0000 1.48 *************** *** 196,199 **** --- 196,203 ---- } + function set($query_var, $value) { + $this->query_vars[$query_var] = $value; + } + function get_posts() { global $wpdb, $pagenow, $request, $user_ID; From saxmatt at users.sourceforge.net Tue Feb 1 01:13:13 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 01:13:34 2005 Subject: [wp-cvs] wordpress/wp-includes functions-formatting.php,1.63,1.64 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28411/wp-includes Modified Files: functions-formatting.php Log Message: Copyright and registered corrections cause more trouble than they help Index: functions-formatting.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** functions-formatting.php 24 Jan 2005 06:01:04 -0000 1.63 --- functions-formatting.php 1 Feb 2005 01:13:11 -0000 1.64 *************** *** 33,38 **** $curl = preg_replace("/'([\s.]|\Z)/", '’$1', $curl); $curl = preg_replace("/ \(tm\)/i", ' ™', $curl); - $curl = preg_replace("/ \(c\)/i", ' ©', $curl); - $curl = preg_replace("/ \(r\)/i", ' ®', $curl); $curl = str_replace("''", '”', $curl); --- 33,36 ---- From rboren at users.sourceforge.net Tue Feb 1 01:49:54 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 01:49:59 2005 Subject: [wp-cvs] wordpress/wp-admin post.php,1.123,1.124 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6174/wp-admin Modified Files: post.php Log Message: Remove support for 'all' queries and for poststart and postend. Index: post.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** post.php 31 Jan 2005 10:32:28 -0000 1.123 --- post.php 1 Feb 2005 01:49:51 -0000 1.124 *************** *** 2,6 **** require_once('admin.php'); ! $wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder' ); for ($i=0; $i Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6174/wp-includes Modified Files: classes.php Log Message: Remove support for 'all' queries and for poststart and postend. Index: classes.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** classes.php 1 Feb 2005 01:04:08 -0000 1.48 --- classes.php 1 Feb 2005 01:49:51 -0000 1.49 *************** *** 67,71 **** if ('' != $qv['name']) { $this->is_single = true; ! } elseif ( $qv['p'] && $qv['p'] != 'all' ) { $this->is_single = true; } elseif (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) { --- 67,71 ---- if ('' != $qv['name']) { $this->is_single = true; ! } elseif ( $qv['p'] ) { $this->is_single = true; } elseif (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) { *************** *** 134,138 **** } ! if (empty($qv['cat']) || ($qv['cat'] == 'all') || ($qv['cat'] == '0')) { $this->is_category = false; } else { --- 134,138 ---- } ! if (empty($qv['cat']) || ($qv['cat'] == '0')) { $this->is_category = false; } else { *************** *** 148,152 **** } ! if ((empty($qv['author'])) || ($qv['author'] == 'all') || ($qv['author'] == '0')) { $this->is_author = false; } else { --- 148,152 ---- } ! if ((empty($qv['author'])) || ($qv['author'] == '0')) { $this->is_author = false; } else { *************** *** 299,308 **** // If a post number is specified, load that post ! if (($q['p'] != '') && ($q['p'] != 'all') && intval($q['p']) != 0) { $q['p'] = (int) $q['p']; $where = ' AND ID = ' . $q['p']; } ! if (($q['page_id'] != '') && ($q['page_id'] != 'all')) { $q['page_id'] = intval($q['page_id']); $q['p'] = $q['page_id']; --- 299,308 ---- // If a post number is specified, load that post ! if (($q['p'] != '') && intval($q['p']) != 0) { $q['p'] = (int) $q['p']; $where = ' AND ID = ' . $q['p']; } ! if (($q['page_id'] != '') && (intval($q['page_id']) != 0)) { $q['page_id'] = intval($q['page_id']); $q['p'] = $q['page_id']; *************** *** 339,343 **** // Category stuff ! if ((empty($q['cat'])) || ($q['cat'] == 'all') || ($q['cat'] == '0') || // Bypass cat checks if fetching specific posts ( --- 339,343 ---- // Category stuff ! if ((empty($q['cat'])) || ($q['cat'] == '0') || // Bypass cat checks if fetching specific posts ( *************** *** 398,402 **** // Author/user stuff ! if ((empty($q['author'])) || ($q['author'] == 'all') || ($q['author'] == '0')) { $whichauthor=''; } else { --- 398,402 ---- // Author/user stuff ! if ((empty($q['author'])) || ($q['author'] == '0')) { $whichauthor=''; } else { *************** *** 465,479 **** } - if ($q['p'] == 'all') { - $where = ''; - } - $now = gmdate('Y-m-d H:i:59'); if ($pagenow != 'post.php' && $pagenow != 'edit.php') { ! if ((empty($q['poststart'])) || (empty($q['postend'])) || !($q['postend'] > $q['poststart'])) { ! $where .= " AND post_date_gmt <= '$now'"; ! } ! $distinct = 'DISTINCT'; } --- 465,472 ---- } $now = gmdate('Y-m-d H:i:59'); if ($pagenow != 'post.php' && $pagenow != 'edit.php') { ! $where .= " AND post_date_gmt <= '$now'"; $distinct = 'DISTINCT'; } *************** *** 497,518 **** // Paging ! if ( !empty($q['postend']) && ($q['postend'] > $q['poststart']) ) { ! if ($q['what_to_show'] == 'posts') { ! $q['poststart'] = intval($q['poststart']); ! $q['postend'] = intval($q['postend']); ! $limposts = $q['postend'] - $q['poststart']; ! $limits = ' LIMIT '.$q['poststart'].','.$limposts; ! } elseif ($q['what_to_show'] == 'days') { ! $q['poststart'] = intval($q['poststart']); ! $q['postend'] = intval($q['postend']); ! $limposts = $q['postend'] - $q['poststart']; ! $lastpostdate = get_lastpostdate(); ! $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate); ! $lastpostdate = mysql2date('U',$lastpostdate); ! $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['poststart'] -1) * 86400))); ! $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['postend'] -1) * 86400))); ! $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'"; ! } ! } else if (empty($q['nopaging']) && ! is_single()) { $page = $q['paged']; if (empty($page)) { --- 490,494 ---- // Paging ! if (empty($q['nopaging']) && ! is_single()) { $page = $q['paged']; if (empty($page)) { From rboren at users.sourceforge.net Tue Feb 1 01:49:53 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 01:50:04 2005 Subject: [wp-cvs] wordpress wp-blog-header.php,1.113,1.114 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6174 Modified Files: wp-blog-header.php Log Message: Remove support for 'all' queries and for poststart and postend. Index: wp-blog-header.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** wp-blog-header.php 19 Jan 2005 16:15:45 -0000 1.113 --- wp-blog-header.php 1 Feb 2005 01:49:51 -0000 1.114 *************** *** 83,87 **** } ! $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', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error'); $wpvarstoreset = apply_filters('query_vars', $wpvarstoreset); --- 83,87 ---- } ! $wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error'); $wpvarstoreset = apply_filters('query_vars', $wpvarstoreset); From saxmatt at users.sourceforge.net Tue Feb 1 01:51:08 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 01:51:16 2005 Subject: [wp-cvs] wordpress/wp-admin import-mt.php,1.18,1.19 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6658/wp-admin Modified Files: import-mt.php Log Message: Old variable would mysteriously crash some configs. Index: import-mt.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/import-mt.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** import-mt.php 6 Jan 2005 23:10:16 -0000 1.18 --- import-mt.php 1 Feb 2005 01:51:05 -0000 1.19 *************** *** 1,4 **** --- 7,11 ---- require('../wp-config.php'); require ('upgrade-functions.php'); ! $step = $_GET['step']; if (!$step) $step = 0; ?> *************** *** 56,60 ****

You have to do this manually for security reasons.

If you've done that and you’re all ready, let's go! Remember that the import process may take a minute or so if you have a large number of entries and comments. Think of all the rebuilding time you'll be saving once it's done. :)

!

The importer is smart enough not to import duplicates, so you can run this multiple times without worry if—for whatever reason—it doesn't finish.

You have to do this manually for security reasons.

If you've done that and you’re all ready, let's go! Remember that the import process may take a minute or so if you have a large number of entries and comments. Think of all the rebuilding time you'll be saving once it's done. :)

!

The importer is smart enough not to import duplicates, so you can run this multiple times without worry if—for whatever reason—it doesn't finish. If you get an out of memory error try splitting up the import file into pieces.

Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9817 Modified Files: template-functions-links.php Log Message: Feed link fix for bug 775. Hat tip: Kafkaesqui Index: template-functions-links.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** template-functions-links.php 26 Jan 2005 22:46:40 -0000 1.51 --- template-functions-links.php 1 Feb 2005 02:01:38 -0000 1.52 *************** *** 162,167 **** $permalink = str_replace('%feed%', $feed, $permalink); ! $output = get_settings('home') . "/$permalink/"; ! $output = preg_replace('#/+#', '/', $output); } else { if ( false !== strpos($feed, 'comments_') ) --- 162,167 ---- $permalink = str_replace('%feed%', $feed, $permalink); ! $permalink = preg_replace('#/+#', '/', "/$permalink/"); ! $output = get_settings('home') . $permalink; } else { if ( false !== strpos($feed, 'comments_') ) From saxmatt at users.sourceforge.net Tue Feb 1 02:03:23 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 02:03:26 2005 Subject: [wp-cvs] wordpress wp-links-opml.php,1.10,1.11 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10352 Modified Files: wp-links-opml.php Log Message: Updating OPML feed. Index: wp-links-opml.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-links-opml.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wp-links-opml.php 7 Jan 2005 01:17:42 -0000 1.10 --- wp-links-opml.php 1 Feb 2005 02:03:21 -0000 1.11 *************** *** 19,23 **** } } ! ?>\n"; ?> --- 19,23 ---- } } ! ?>\n"; ?> *************** *** 27,31 **** ! links.link_url, link_rss, $wpdb->links.link_name, $wpdb->links.link_category, $wpdb->linkcategories.cat_name FROM $wpdb->links LEFT JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id --- 27,31 ---- ! links.link_url, link_rss, $wpdb->links.link_name, $wpdb->links.link_category, $wpdb->linkcategories.cat_name, link_updated FROM $wpdb->links LEFT JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id *************** *** 49,53 **** } // end if new category ?> ! ! Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31723 Modified Files: wp-blog-header.php Log Message: get_*_template() functions and filters. Index: wp-blog-header.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** wp-blog-header.php 1 Feb 2005 01:49:51 -0000 1.114 --- wp-blog-header.php 1 Feb 2005 03:44:31 -0000 1.115 *************** *** 226,264 **** include(ABSPATH . '/wp-trackback.php'); exit; ! } else if ( is_404() && file_exists("$wp_template_dir/404.php") ) { ! include("$wp_template_dir/404.php"); exit; ! } else if ( is_home() && file_exists("$wp_template_dir/index.php") ) { ! include("$wp_template_dir/index.php"); exit; ! } else if ( is_single() && file_exists("$wp_template_dir/single.php") ) { ! include("$wp_template_dir/single.php"); exit; ! } else if ( is_page() && file_exists(get_page_template()) ) { include(get_page_template()); exit; ! } else if ( is_category() && file_exists("$wp_template_dir/category-" . get_query_var('cat') . '.php') ) { ! include("$wp_template_dir/category-" . get_query_var('cat') . '.php'); exit; ! } else if ( is_category() && file_exists("$wp_template_dir/category.php") ) { ! include("$wp_template_dir/category.php"); ! exit; ! } else if ( is_author() && file_exists("$wp_template_dir/author.php") ) { ! include("$wp_template_dir/author.php"); exit; ! } else if ( is_date() && file_exists("$wp_template_dir/date.php") ) { ! include("$wp_template_dir/date.php"); exit; ! } else if ( is_archive() && file_exists("$wp_template_dir/archive.php") ) { ! include("$wp_template_dir/archive.php"); exit; ! } else if ( is_search() && file_exists("$wp_template_dir/search.php") ) { ! include("$wp_template_dir/search.php"); exit; ! } else if ( is_paged() && file_exists("$wp_template_dir/paged.php") ) { ! include("$wp_template_dir/paged.php"); exit; ! } else if ( file_exists("$wp_template_dir/index.php") ) { ! include("$wp_template_dir/index.php"); exit; } --- 226,261 ---- include(ABSPATH . '/wp-trackback.php'); exit; ! } else if ( is_404() && get_404_template() ) { ! include(get_404_template()); exit; ! } else if ( is_home() && get_home_template() ) { ! include(get_home_template()); exit; ! } else if ( is_single() && get_single_template() ) { ! include(get_single_template()); exit; ! } else if ( is_page() && get_page_template() ) { include(get_page_template()); exit; ! } else if ( is_category() && get_category_template()) { ! include(get_category_template()); exit; ! } else if ( is_author() && get_author_template() ) { ! include(get_author_template()); exit; ! } else if ( is_date() && get_date_template() ) { ! include(get_date_template()); exit; ! } else if ( is_archive() && get_archive_template() ) { ! include(get_archive_template()); exit; ! } else if ( is_search() && get_search_template() ) { ! include(get_search_template()); exit; ! } else if ( is_paged() && get_paged_template() ) { ! include(get_paged_template()); exit; ! } else if ( file_exists(TEMPLATEPATH . "/index.php") ) { ! include(TEMPLATEPATH . "/index.php"); exit; } From rboren at users.sourceforge.net Tue Feb 1 03:44:34 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 03:44:49 2005 Subject: [wp-cvs] wordpress/wp-includes functions.php,1.243,1.244 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31723/wp-includes Modified Files: functions.php Log Message: get_*_template() functions and filters. Index: functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v retrieving revision 1.243 retrieving revision 1.244 diff -C2 -d -r1.243 -r1.244 *** functions.php 31 Jan 2005 18:46:17 -0000 1.243 --- functions.php 1 Feb 2005 03:44:32 -0000 1.244 *************** *** 1453,1474 **** } function get_page_template() { global $wp_query; $id = $wp_query->post->ID; - $template_dir = get_template_directory(); - $default = "$template_dir/page.php"; - $template = get_post_meta($id, '_wp_page_template', true); ! if (empty($template) || ($template == 'default')) { ! return $default; ! } ! if (file_exists("$template_dir/$template")) { ! return "$template_dir/$template"; ! } ! return $default; } --- 1453,1527 ---- } + function get_query_template($type) { + $template = ''; + if ( file_exists(TEMPLATEPATH . "/{$type}.php") ) + $template = TEMPLATEPATH . "/{$type}.php"; + + return apply_filters("{$type}_template", $template); + } + + function get_404_template() { + return get_query_template('404'); + } + + function get_archive_template() { + return get_query_template('archive'); + } + + function get_author_template() { + return get_query_template('author'); + } + + function get_category_template() { + $template = ''; + if ( file_exists(TEMPLATEPATH . "/category-" . get_query_var('cat') . '.php') ) + $template = TEMPLATEPATH . "/category-" . get_query_var('cat') . '.php'; + else if ( file_exists(TEMPLATEPATH . "/category.php") ) + $template = TEMPLATEPATH . "/category.php"; + + return apply_filters('category_template', $template); + } + + function get_date_template() { + return get_query_template('date'); + } + + function get_home_template() { + $template = ''; + if ( file_exists(TEMPLATEPATH . "/index.php") ) + $template = TEMPLATEPATH . "/index.php"; + + return apply_filters('home_template', $template); + } + function get_page_template() { global $wp_query; $id = $wp_query->post->ID; $template = get_post_meta($id, '_wp_page_template', true); ! if ( 'default' == $template ) ! $template = ''; ! if ( ! empty($template) && file_exists(TEMPLATEPATH . "/$template") ) ! $template = TEMPLATEPATH . "/$template"; ! else if ( file_exists(TEMPLATEPATH . "/page.php") ) ! $template = TEMPLATEPATH . "/page.php"; ! else ! $template = ''; ! return apply_filters('page_template', $template); ! } ! ! function get_paged_template() { ! return get_query_template('paged'); ! } ! ! function get_search_template() { ! return get_query_template('search'); ! } ! ! function get_single_template() { ! return get_query_template('single'); } From rboren at users.sourceforge.net Tue Feb 1 06:20:55 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 06:21:04 2005 Subject: [wp-cvs] wordpress wp-blog-header.php, 1.115, 1.116 wp-settings.php, 1.70, 1.71 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31963 Modified Files: wp-blog-header.php wp-settings.php Log Message: Allow multiple args to be passed to apply_filters and do_action. Move some code into merge_filters. Use call_user_func_array so that args can be passed by reference. Provide a default for the second arg to do_action so that we do not have to put empty strings in the do_action calls. Bug 768. Hat tip: morganiq Index: wp-settings.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** wp-settings.php 31 Jan 2005 10:28:53 -0000 1.70 --- wp-settings.php 1 Feb 2005 06:20:53 -0000 1.71 *************** *** 121,129 **** function shutdown_action_hook() { ! do_action('shutdown', ''); } register_shutdown_function('shutdown_action_hook'); // Everything is loaded. ! do_action('init', ''); ?> \ No newline at end of file --- 121,129 ---- function shutdown_action_hook() { ! do_action('shutdown'); } register_shutdown_function('shutdown_action_hook'); // Everything is loaded. ! do_action('init'); ?> \ No newline at end of file Index: wp-blog-header.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** wp-blog-header.php 1 Feb 2005 03:44:31 -0000 1.115 --- wp-blog-header.php 1 Feb 2005 06:20:53 -0000 1.116 *************** *** 219,223 **** } elseif ( !isset($wp_template_redirect) ) { $wp_template_redirect = true; ! do_action('template_redirect', ''); if ( is_feed() ) { include(ABSPATH . '/wp-feed.php'); --- 219,223 ---- } elseif ( !isset($wp_template_redirect) ) { $wp_template_redirect = true; ! do_action('template_redirect'); if ( is_feed() ) { include(ABSPATH . '/wp-feed.php'); From rboren at users.sourceforge.net Tue Feb 1 06:20:56 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 06:21:06 2005 Subject: [wp-cvs] wordpress/wp-content/themes/default footer.php,1.3,1.4 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-content/themes/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31963/wp-content/themes/default Modified Files: footer.php Log Message: Allow multiple args to be passed to apply_filters and do_action. Move some code into merge_filters. Use call_user_func_array so that args can be passed by reference. Provide a default for the second arg to do_action so that we do not have to put empty strings in the do_action calls. Bug 768. Hat tip: morganiq Index: footer.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/default/footer.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** footer.php 14 Jan 2005 06:18:47 -0000 1.3 --- footer.php 1 Feb 2005 06:20:53 -0000 1.4 *************** *** 15,19 **** ! --- 15,19 ---- ! From rboren at users.sourceforge.net Tue Feb 1 06:20:56 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 06:21:09 2005 Subject: [wp-cvs] wordpress/wp-includes classes.php, 1.49, 1.50 functions-post.php, 1.36, 1.37 functions.php, 1.244, 1.245 template-functions-general.php, 1.65, 1.66 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31963/wp-includes Modified Files: classes.php functions-post.php functions.php template-functions-general.php Log Message: Allow multiple args to be passed to apply_filters and do_action. Move some code into merge_filters. Use call_user_func_array so that args can be passed by reference. Provide a default for the second arg to do_action so that we do not have to put empty strings in the do_action calls. Bug 768. Hat tip: morganiq Index: functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v retrieving revision 1.244 retrieving revision 1.245 diff -C2 -d -r1.244 -r1.245 *** functions.php 1 Feb 2005 03:44:32 -0000 1.244 --- functions.php 1 Feb 2005 06:20:54 -0000 1.245 *************** *** 871,875 **** // Filters: these are the core of WP's plugin architecture ! function apply_filters($tag, $string, $filter = true) { global $wp_filter; if (isset($wp_filter['all'])) { --- 871,875 ---- // Filters: these are the core of WP's plugin architecture ! function merge_filters($tag) { global $wp_filter; if (isset($wp_filter['all'])) { *************** *** 884,896 **** } ! if (isset($wp_filter[$tag])) { ksort($wp_filter[$tag]); foreach ($wp_filter[$tag] as $priority => $functions) { if (!is_null($functions)) { foreach($functions as $function) { ! if ($filter) ! $string = call_user_func($function, $string); ! else ! call_user_func($function, $string); } } --- 884,903 ---- } ! if (isset($wp_filter[$tag])) ksort($wp_filter[$tag]); + } + + function apply_filters($tag, $string) { + global $wp_filter; + + $args = array($string) + array_slice(func_get_args(), 3); + + merge_filters($tag); + + if (isset($wp_filter[$tag])) { foreach ($wp_filter[$tag] as $priority => $functions) { if (!is_null($functions)) { foreach($functions as $function) { ! $string = call_user_func_array($function, $args); } } *************** *** 925,931 **** // The *_action functions are just aliases for the *_filter functions, they take special strings instead of generic content ! function do_action($tag, $string) { ! apply_filters($tag, $string, false); ! return $string; } --- 932,954 ---- // The *_action functions are just aliases for the *_filter functions, they take special strings instead of generic content ! function do_action($tag, $arg = '') { ! global $wp_filter; ! ! if ( is_array($arg) ) ! $args = $arg + array_slice(func_get_args(), 2); ! else ! $args = array($action) + array_slice(func_get_args(), 2); ! ! merge_filters($tag); ! ! if (isset($wp_filter[$tag])) { ! foreach ($wp_filter[$tag] as $priority => $functions) { ! if (!is_null($functions)) { ! foreach($functions as $function) { ! $string = call_user_func_array($function, $args); ! } ! } ! } ! } } *************** *** 1065,1069 **** function wp_head() { ! do_action('wp_head', ''); } --- 1088,1092 ---- function wp_head() { ! do_action('wp_head'); } Index: functions-post.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** functions-post.php 31 Jan 2005 06:38:12 -0000 1.36 --- functions-post.php 1 Feb 2005 06:20:54 -0000 1.37 *************** *** 385,389 **** global $wpdb; ! do_action('wp_blacklist_check', ''); if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) { --- 385,389 ---- global $wpdb; ! do_action('wp_blacklist_check'); if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) { *************** *** 450,454 **** $time_newcomment = mysql2date('U', $now_gmt); if ( ($time_newcomment - $time_lastcomment) < 15 ) { ! do_action('comment_flood_trigger', ''); die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') ); } --- 450,454 ---- $time_newcomment = mysql2date('U', $now_gmt); if ( ($time_newcomment - $time_lastcomment) < 15 ) { ! do_action('comment_flood_trigger'); die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') ); } Index: template-functions-general.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** template-functions-general.php 24 Jan 2005 10:06:53 -0000 1.65 --- template-functions-general.php 1 Feb 2005 06:20:54 -0000 1.66 *************** *** 55,59 **** function wp_meta() { ! do_action('wp_meta', 1); } --- 55,59 ---- function wp_meta() { ! do_action('wp_meta'); } Index: classes.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** classes.php 1 Feb 2005 01:49:51 -0000 1.49 --- classes.php 1 Feb 2005 06:20:54 -0000 1.50 *************** *** 1140,1144 **** $this->rules = $page_rewrite + $root_rewrite + $comments_rewrite + $search_rewrite + $category_rewrite + $author_rewrite + $date_rewrite + $post_rewrite; ! do_action('generate_rewrite_rules', ''); $this->rules = apply_filters('rewrite_rules_array', $this->rules); return $this->rules; --- 1140,1144 ---- $this->rules = $page_rewrite + $root_rewrite + $comments_rewrite + $search_rewrite + $category_rewrite + $author_rewrite + $date_rewrite + $post_rewrite; ! do_action('generate_rewrite_rules', array(&$this)); $this->rules = apply_filters('rewrite_rules_array', $this->rules); return $this->rules; From rboren at users.sourceforge.net Tue Feb 1 06:20:55 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 06:21:18 2005 Subject: [wp-cvs] wordpress/wp-content/themes/classic footer.php,1.1,1.2 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-content/themes/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31963/wp-content/themes/classic Modified Files: footer.php Log Message: Allow multiple args to be passed to apply_filters and do_action. Move some code into merge_filters. Use call_user_func_array so that args can be passed by reference. Provide a default for the second arg to do_action so that we do not have to put empty strings in the do_action calls. Bug 768. Hat tip: morganiq Index: footer.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/classic/footer.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** footer.php 4 Jan 2005 05:20:05 -0000 1.1 --- footer.php 1 Feb 2005 06:20:53 -0000 1.2 *************** *** 8,12 **** ! \ No newline at end of file --- 8,12 ---- ! \ No newline at end of file From rboren at users.sourceforge.net Tue Feb 1 06:43:34 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 06:43:49 2005 Subject: [wp-cvs] wordpress wp-blog-header.php,1.116,1.117 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3619 Modified Files: wp-blog-header.php Log Message: Remove extra wp-l10n.php include. Bug 756. Index: wp-blog-header.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** wp-blog-header.php 1 Feb 2005 06:20:53 -0000 1.116 --- wp-blog-header.php 1 Feb 2005 06:43:31 -0000 1.117 *************** *** 7,12 **** require_once( dirname(__FILE__) . '/wp-config.php'); - require_once( ABSPATH . '/wp-includes/wp-l10n.php'); - $query_vars = array(); --- 7,10 ---- From rboren at users.sourceforge.net Tue Feb 1 06:59:48 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 07:00:10 2005 Subject: [wp-cvs] wordpress/wp-admin admin-functions.php,1.77,1.78 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7259 Modified Files: admin-functions.php Log Message: get_home_path() fixes. Index: admin-functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** admin-functions.php 30 Jan 2005 07:34:03 -0000 1.77 --- admin-functions.php 1 Feb 2005 06:59:44 -0000 1.78 *************** *** 848,854 **** if ( $home != '' && $home != get_settings('siteurl') ) { $home_path = parse_url($home); ! $home_path = $home_root['path']; $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]); ! $home_path = $root . $home_path . "/"; } else { $home_path = ABSPATH; --- 848,854 ---- if ( $home != '' && $home != get_settings('siteurl') ) { $home_path = parse_url($home); ! $home_path = $home_path['path']; $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]); ! $home_path = trailingslashit($root . $home_path); } else { $home_path = ABSPATH; From rboren at users.sourceforge.net Tue Feb 1 07:05:02 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 07:05:12 2005 Subject: [wp-cvs] wordpress/wp-includes classes.php,1.50,1.51 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8556 Modified Files: classes.php Log Message: Use parse_url instead of regex wackiness. Index: classes.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** classes.php 1 Feb 2005 06:20:54 -0000 1.50 --- classes.php 1 Feb 2005 07:05:00 -0000 1.51 *************** *** 1155,1166 **** } ! $site_root = str_replace('http://', '', trim(get_settings('siteurl'))); ! $site_root = preg_replace('|([^/]*)(.*)|i', '$2', $site_root); ! if ('/' != substr($site_root, -1)) $site_root = $site_root . '/'; ! ! $home_root = str_replace('http://', '', trim(get_settings('home'))); ! $home_root = preg_replace('|([^/]*)(.*)|i', '$2', $home_root); ! if ('/' != substr($home_root, -1)) $home_root = $home_root . '/'; $rules = "\n"; $rules .= "RewriteEngine On\n"; --- 1155,1164 ---- } ! $site_root = parse_url(get_settings('siteurl')); ! $site_root = trailingslashit($site_root['path']); + $home_root = parse_url(get_settings('home')); + $home_root = trailingslashit($home_root['path']); + $rules = "\n"; $rules .= "RewriteEngine On\n"; From saxmatt at users.sourceforge.net Tue Feb 1 08:11:15 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 08:11:29 2005 Subject: [wp-cvs] wordpress xmlrpc.php,1.40,1.41 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21397 Modified Files: xmlrpc.php Log Message: We weren't getting [...] in front of pingbacks. Index: xmlrpc.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/xmlrpc.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** xmlrpc.php 6 Jan 2005 23:28:51 -0000 1.40 --- xmlrpc.php 1 Feb 2005 08:11:02 -0000 1.41 *************** *** 1211,1215 **** $original_context = strip_tags($context); $context = '[...] '; ! $context = wp_specialchars($original_context); $context .= ' [...]'; $original_pagelinkedfrom = $pagelinkedfrom; --- 1211,1215 ---- $original_context = strip_tags($context); $context = '[...] '; ! $context .= wp_specialchars($original_context); $context .= ' [...]'; $original_pagelinkedfrom = $pagelinkedfrom; From rboren at users.sourceforge.net Tue Feb 1 08:31:16 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 08:31:46 2005 Subject: [wp-cvs] wordpress/wp-includes functions-formatting.php,1.64,1.65 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26520/wp-includes Modified Files: functions-formatting.php Log Message: Don't stomp the percent in escaped octets. Index: functions-formatting.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** functions-formatting.php 1 Feb 2005 01:13:11 -0000 1.64 --- functions-formatting.php 1 Feb 2005 08:31:13 -0000 1.65 *************** *** 218,222 **** function sanitize_title_with_dashes($title) { $title = strip_tags($title); ! $title = preg_replace('|%|', '', $title); $title = remove_accents($title); if (seems_utf8($title)) { --- 218,228 ---- function sanitize_title_with_dashes($title) { $title = strip_tags($title); ! // Preserve escaped octets. ! $title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title); ! // Remove percent signs that are not part of an octet. ! $title = str_replace('%', '', $title); ! // Restore octets. ! $title = preg_replace('|---([a-fA-F0-9][a-fA-F0-9])---|', '%$1', $title); ! $title = remove_accents($title); if (seems_utf8($title)) { From rboren at users.sourceforge.net Tue Feb 1 08:34:21 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 08:34:58 2005 Subject: [wp-cvs] wordpress/wp-includes classes.php,1.51,1.52 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27128/wp-includes Modified Files: classes.php Log Message: Add parse_query_vars() and parse_query action. Index: classes.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** classes.php 1 Feb 2005 07:05:00 -0000 1.51 --- classes.php 1 Feb 2005 08:34:19 -0000 1.52 *************** *** 57,65 **** } function parse_query ($query) { ! $this->init(); ! parse_str($query, $qv); ! $this->query = $query; ! $this->query_vars = $qv; $qv['m'] = (int) $qv['m']; $qv['p'] = (int) $qv['p']; --- 57,74 ---- } + // Reparse the query vars. + function parse_query_vars() { + $this->parse_query(''); + } + + // Parse a query string and set query type booleans. function parse_query ($query) { ! if ( !empty($query) || !isset($this->query) ) { ! $this->init(); ! parse_str($query, $qv); ! $this->query = $query; ! $this->query_vars = $qv; ! } ! $qv['m'] = (int) $qv['m']; $qv['p'] = (int) $qv['p']; *************** *** 186,189 **** --- 195,202 ---- $this->is_home = true; } + + if ( !empty($query) ) { + do_action('parse_query', array(&$this)); + } } From rboren at users.sourceforge.net Tue Feb 1 08:35:47 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 08:36:00 2005 Subject: [wp-cvs] wordpress/wp-includes classes.php,1.52,1.53 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27382/wp-includes Modified Files: classes.php Log Message: Fix i18n page links. Handle RTL hierarchies. Index: classes.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** classes.php 1 Feb 2005 08:34:19 -0000 1.52 --- classes.php 1 Feb 2005 08:35:45 -0000 1.53 *************** *** 300,304 **** $where .= " AND post_name = '" . $q['name'] . "'"; } else if ('' != $q['pagename']) { ! $q['pagename'] = sanitize_title(basename($q['pagename'])); $q['name'] = $q['pagename']; $where .= " AND post_name = '" . $q['pagename'] . "'"; --- 300,304 ---- $where .= " AND post_name = '" . $q['name'] . "'"; } else if ('' != $q['pagename']) { ! $q['pagename'] = sanitize_title(basename(str_replace('%2F', '/', urlencode($q['pagename'])))); $q['name'] = $q['pagename']; $where .= " AND post_name = '" . $q['pagename'] . "'"; From saxmatt at users.sourceforge.net Tue Feb 1 09:52:38 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 09:52:51 2005 Subject: [wp-cvs] wordpress/wp-includes rss-functions.php,1.2,1.3 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/wp-includes Modified Files: rss-functions.php Log Message: Dashboard and option tweaks Index: rss-functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/rss-functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rss-functions.php 1 Jan 2005 22:09:08 -0000 1.2 --- rss-functions.php 1 Feb 2005 09:52:36 -0000 1.3 *************** *** 599,603 **** if ( !defined('MAGPIE_FETCH_TIME_OUT') ) { ! define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout } --- 599,603 ---- if ( !defined('MAGPIE_FETCH_TIME_OUT') ) { ! define('MAGPIE_FETCH_TIME_OUT', 2); // 2 second timeout } From saxmatt at users.sourceforge.net Tue Feb 1 09:52:38 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 09:52:59 2005 Subject: [wp-cvs] wordpress/wp-admin index.php, 1.15, 1.16 upgrade-schema.php, 1.20, 1.21 wp-admin.css, 1.82, 1.83 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/wp-admin Modified Files: index.php upgrade-schema.php wp-admin.css Log Message: Dashboard and option tweaks Index: wp-admin.css =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/wp-admin.css,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** wp-admin.css 6 Jan 2005 09:52:11 -0000 1.82 --- wp-admin.css 1 Feb 2005 09:52:36 -0000 1.83 *************** *** 506,510 **** border-bottom: 1px solid #ccc; font-size: 16px; ! margin: 1em 0; } --- 506,515 ---- border-bottom: 1px solid #ccc; font-size: 16px; ! margin: 1em 0 0; ! } ! ! #zeitgeist h3 cite { ! font-size: 12px; ! font-style: normal; } Index: upgrade-schema.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** upgrade-schema.php 31 Jan 2005 06:38:11 -0000 1.20 --- upgrade-schema.php 1 Feb 2005 09:52:36 -0000 1.21 *************** *** 73,77 **** option_can_override enum('Y','N') NOT NULL default 'Y', option_type int(11) NOT NULL default '1', ! option_value text NOT NULL, option_width int(11) NOT NULL default '20', option_height int(11) NOT NULL default '8', --- 73,77 ---- option_can_override enum('Y','N') NOT NULL default 'Y', option_type int(11) NOT NULL default '1', ! option_value longtext NOT NULL, option_width int(11) NOT NULL default '20', option_height int(11) NOT NULL default '8', Index: index.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/index.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** index.php 15 Jan 2005 00:56:42 -0000 1.15 --- index.php 1 Feb 2005 09:52:36 -0000 1.16 *************** *** 85,88 **** --- 85,105 ---- + items) && 0 != count($rss->items) ) { + ?> +
+

»

+
    + items = array_slice($rss->items, 0, 6); + foreach ($rss->items as $item ) { + ?> +
    • + +
+
+ + *************** *** 95,102 ****

WordPress Development Blog

items = array_slice($rss->items, 0, 4); foreach ($rss->items as $item ) { ?> !

'> —

WordPress Development Blog items = array_slice($rss->items, 0, 3); foreach ($rss->items as $item ) { ?> !

'> —

+ + +

»

+
    + items = array_slice($rss->items, 0, 20); + foreach ($rss->items as $item ) { + ?> +
  • '>
    • + +
+ +
From saxmatt at users.sourceforge.net Tue Feb 1 10:04:04 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Tue Feb 1 10:04:40 2005 Subject: [wp-cvs] wordpress/wp-admin import-rss.php,1.9,1.10 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16976/wp-admin Modified Files: import-rss.php Log Message: Preserve GUIDs in imports Index: import-rss.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/import-rss.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** import-rss.php 14 Dec 2004 08:58:11 -0000 1.9 --- import-rss.php 1 Feb 2005 10:04:01 -0000 1.10 *************** *** 111,114 **** --- 111,118 ---- endif; + preg_match('|(.*?)|is', $post, $guid); + if ($guid) $guid = addslashes( trim($guid[1]) ); + else $guid = ''; + preg_match('|(.*?)|is', $post, $content); $content = str_replace( array(''), '', addslashes( trim($content[1]) ) ); *************** *** 138,144 **** $wpdb->query("INSERT INTO $wpdb->posts ! (post_author, post_date, post_date_gmt, post_content, post_title,post_status, comment_status, ping_status, post_name) VALUES ! ('$post_author', '$post_date', DATE_ADD('$post_date', INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE), '$content', '$title', 'publish', '$comment_status', '$ping_status', '$post_name')"); $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'"); if (!$post_id) die("couldn't get post ID"); --- 142,148 ---- $wpdb->query("INSERT INTO $wpdb->posts ! (post_author, post_date, post_date_gmt, post_content, post_title,post_status, comment_status, ping_status, post_name, guid) VALUES ! ('$post_author', '$post_date', DATE_ADD('$post_date', INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE), '$content', '$title', 'publish', '$comment_status', '$ping_status', '$post_name', '$guid')"); $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'"); if (!$post_id) die("couldn't get post ID"); From michelvaldrighi at users.sourceforge.net Tue Feb 1 11:03:49 2005 From: michelvaldrighi at users.sourceforge.net (Michel Valdrighi) Date: Tue Feb 1 11:04:03 2005 Subject: [wp-cvs] wordpress/wp-admin post.php,1.124,1.125 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30829/wp-admin Modified Files: post.php Log Message: Fix for bug #559, capitalisation issue Index: post.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** post.php 1 Feb 2005 01:49:51 -0000 1.124 --- post.php 1 Feb 2005 11:03:45 -0000 1.125 *************** *** 433,437 **** $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'javascript:history.go(-1)')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_id'])) { die('You are not allowed to edit comments on this post.'); } --- 433,437 ---- $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'javascript:history.go(-1)')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_ID'])) { die('You are not allowed to edit comments on this post.'); } *************** *** 455,459 **** $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_delete_post_comments($user_ID, $commentdata['comment_post_id'])) { die('You are not allowed to delete comments on this post.'); } --- 455,459 ---- $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_delete_post_comments($user_ID, $commentdata['comment_post_ID'])) { die('You are not allowed to delete comments on this post.'); } *************** *** 497,501 **** $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'post.php')); ! if (!user_can_delete_post_comments($user_ID, $commentdata['comment_post_id'])) { die('You are not allowed to edit comments on this post.'); } --- 497,501 ---- $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'post.php')); ! if (!user_can_delete_post_comments($user_ID, $commentdata['comment_post_ID'])) { die('You are not allowed to edit comments on this post.'); } *************** *** 528,532 **** $commentdata = get_commentdata($comment) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_id'])) { die('You are not allowed to edit comments on this post, so you cannot disapprove this comment.'); } --- 528,532 ---- $commentdata = get_commentdata($comment) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_ID'])) { die('You are not allowed to edit comments on this post, so you cannot disapprove this comment.'); } *************** *** 548,552 **** $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_id'])) { die('You are not allowed to edit comments on this post, so you cannot approve this comment.'); } --- 548,552 ---- $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_ID'])) { die('You are not allowed to edit comments on this post, so you cannot approve this comment.'); } *************** *** 573,577 **** $commentdata = get_commentdata($comment) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_id'])) { die('You are not allowed to edit comments on this post, so you cannot approve this comment.'); } --- 573,577 ---- $commentdata = get_commentdata($comment) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); ! if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_ID'])) { die('You are not allowed to edit comments on this post, so you cannot approve this comment.'); } From michelvaldrighi at users.sourceforge.net Tue Feb 1 11:14:48 2005 From: michelvaldrighi at users.sourceforge.net (Michel Valdrighi) Date: Tue Feb 1 11:15:05 2005 Subject: [wp-cvs] wordpress/wp-includes template-functions-links.php, 1.52, 1.53 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv966/wp-includes Modified Files: template-functions-links.php Log Message: Fix for bug #559, just use user_can_ functions Index: template-functions-links.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** template-functions-links.php 1 Feb 2005 02:01:38 -0000 1.52 --- template-functions-links.php 1 Feb 2005 11:14:45 -0000 1.53 *************** *** 175,188 **** function edit_post_link($link = 'Edit This', $before = '', $after = '') { ! global $user_level, $post; get_currentuserinfo(); ! if ($user_level > 0) { ! $authordata = get_userdata($post->post_author); ! if ($user_level < $authordata->user_level) { ! return; ! } ! } else { return; } --- 175,183 ---- function edit_post_link($link = 'Edit This', $before = '', $after = '') { ! global $user_ID, $post; get_currentuserinfo(); ! if (!user_can_edit_post($user_ID, $post->ID)) { return; } *************** *** 193,206 **** function edit_comment_link($link = 'Edit This', $before = '', $after = '') { ! global $user_level, $post, $comment; get_currentuserinfo(); ! if ($user_level > 0) { ! $authordata = get_userdata($post->post_author); ! if ($user_level < $authordata->user_level) { ! return; ! } ! } else { return; } --- 188,196 ---- function edit_comment_link($link = 'Edit This', $before = '', $after = '') { ! global $user_ID, $post, $comment; get_currentuserinfo(); ! if (!user_can_edit_post_comments($user_ID, $post->ID)) { return; } From michelvaldrighi at users.sourceforge.net Tue Feb 1 13:21:14 2005 From: michelvaldrighi at users.sourceforge.net (Michel Valdrighi) Date: Tue Feb 1 13:21:29 2005 Subject: [wp-cvs] wordpress wp-mail.php,1.23,1.24 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30431 Modified Files: wp-mail.php Log Message: set emailed posts to be published. won't do no good moblogging if in the end one has to publish everything later Index: wp-mail.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-mail.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wp-mail.php 31 Jan 2005 19:00:25 -0000 1.23 --- wp-mail.php 1 Feb 2005 13:21:12 -0000 1.24 *************** *** 133,137 **** $post_category = $post_categories; ! $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category'); $post_ID = wp_insert_post($post_data); --- 133,140 ---- $post_category = $post_categories; ! // or maybe we should leave the choice to email drafts? propose a way ! $post_status = 'publish'; ! ! $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status'); $post_ID = wp_insert_post($post_data); From rboren at users.sourceforge.net Tue Feb 1 17:27:13 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Tue Feb 1 17:27:32 2005 Subject: [wp-cvs] wordpress/wp-includes functions.php,1.245,1.246 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27228/wp-includes Modified Files: functions.php Log Message: Fix typo spotted by morganiq. Index: functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v retrieving revision 1.245 retrieving revision 1.246 diff -C2 -d -r1.245 -r1.246 *** functions.php 1 Feb 2005 06:20:54 -0000 1.245 --- functions.php 1 Feb 2005 17:27:10 -0000 1.246 *************** *** 938,942 **** $args = $arg + array_slice(func_get_args(), 2); else ! $args = array($action) + array_slice(func_get_args(), 2); merge_filters($tag); --- 938,942 ---- $args = $arg + array_slice(func_get_args(), 2); else ! $args = array($arg) + array_slice(func_get_args(), 2); merge_filters($tag); From rboren at users.sourceforge.net Wed Feb 2 06:07:17 2005 From: rboren at users.sourceforge.net (Ryan Boren) Date: Wed Feb 2 06:07:25 2005 Subject: [wp-cvs] wordpress/wp-includes functions.php,1.246,1.247 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2080 Modified Files: functions.php Log Message: Fix apply_filters. Bug 777. Index: functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v retrieving revision 1.246 retrieving revision 1.247 diff -C2 -d -r1.246 -r1.247 *** functions.php 1 Feb 2005 17:27:10 -0000 1.246 --- functions.php 2 Feb 2005 06:07:11 -0000 1.247 *************** *** 891,896 **** global $wp_filter; - $args = array($string) + array_slice(func_get_args(), 3); - merge_filters($tag); --- 891,894 ---- *************** *** 899,902 **** --- 897,901 ---- if (!is_null($functions)) { foreach($functions as $function) { + $args = array($string) + array_slice(func_get_args(), 3); $string = call_user_func_array($function, $args); } *************** *** 1745,1747 **** } ! ?> \ No newline at end of file --- 1744,1746 ---- } ! ?> From saxmatt at users.sourceforge.net Wed Feb 2 08:40:46 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 08:40:51 2005 Subject: [wp-cvs] wordpress/wp-admin options-discussion.php, 1.26, 1.27 upgrade-schema.php, 1.21, 1.22 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32276/wp-admin Modified Files: options-discussion.php upgrade-schema.php Log Message: Adding support for a proxy-specific RBL that has shown to be extremely effective Index: upgrade-schema.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** upgrade-schema.php 1 Feb 2005 09:52:36 -0000 1.21 --- upgrade-schema.php 2 Feb 2005 08:40:44 -0000 1.22 *************** *** 215,218 **** --- 215,219 ---- add_option('blacklist_keys'); add_option('comment_registration', 0); + add_option('open_proxy_check', 1); // Delete unused options Index: options-discussion.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-discussion.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** options-discussion.php 31 Jan 2005 06:38:05 -0000 1.26 --- options-discussion.php 2 Feb 2005 08:40:44 -0000 1.27 *************** *** 23,27 ****
!
(These settings may be overridden for individual articles.)') ?> --- 23,27 ---- !
(These settings may be overridden for individual articles.)') ?> *************** *** 88,92 ****

!

--- 88,95 ----

!

!

From saxmatt at users.sourceforge.net Wed Feb 2 08:40:47 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 08:40:53 2005 Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.37,1.38 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32276/wp-includes Modified Files: functions-post.php Log Message: Adding support for a proxy-specific RBL that has shown to be extremely effective Index: functions-post.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** functions-post.php 1 Feb 2005 06:20:54 -0000 1.37 --- functions-post.php 2 Feb 2005 08:40:44 -0000 1.38 *************** *** 418,421 **** --- 418,428 ---- if ( preg_match($pattern, $user_agent) ) return true; } + + if ( get_option('open_proxy_check') && isset($_SERVER['REMOTE_ADDR']) ) { + $rev_ip = implode( '.', array_reverse( explode( '.', $_SERVER['REMOTE_ADDR'] ) ) ); + $lookup = $rev_ip . '.opm.blitzed.org'; + if ( $lookup != gethostbyname( $lookup ) ) + return true; + } return false; From saxmatt at users.sourceforge.net Wed Feb 2 09:41:09 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 09:41:16 2005 Subject: [wp-cvs] wordpress/wp-admin upgrade-functions.php, 1.87, 1.88 upgrade-schema.php, 1.22, 1.23 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14183/wp-admin Modified Files: upgrade-functions.php upgrade-schema.php Log Message: We didn't know how big it'd get :) Index: upgrade-schema.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** upgrade-schema.php 2 Feb 2005 08:40:44 -0000 1.22 --- upgrade-schema.php 2 Feb 2005 09:41:06 -0000 1.23 *************** *** 6,13 **** cat_name varchar(55) NOT NULL default '', category_nicename varchar(200) NOT NULL default '', ! category_description text NOT NULL, category_parent int(4) NOT NULL default '0', PRIMARY KEY (cat_ID), - UNIQUE KEY cat_name (cat_name), KEY category_nicename (category_nicename) ); --- 6,12 ---- cat_name varchar(55) NOT NULL default '', category_nicename varchar(200) NOT NULL default '', ! category_description lengtext NOT NULL, category_parent int(4) NOT NULL default '0', PRIMARY KEY (cat_ID), KEY category_nicename (category_nicename) ); *************** *** 103,107 **** post_date datetime NOT NULL default '0000-00-00 00:00:00', post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00', ! post_content text NOT NULL, post_title text NOT NULL, post_category int(4) NOT NULL default '0', --- 102,106 ---- post_date datetime NOT NULL default '0000-00-00 00:00:00', post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00', ! post_content longtext NOT NULL, post_title text NOT NULL, post_category int(4) NOT NULL default '0', *************** *** 145,149 **** user_activation_key varchar(60) NOT NULL default '', user_status int(11) NOT NULL default '0', ! user_description TEXT NOT NULL default '', PRIMARY KEY (ID), UNIQUE KEY user_login (user_login) --- 144,148 ---- user_activation_key varchar(60) NOT NULL default '', user_status int(11) NOT NULL default '0', ! user_description longtext NOT NULL default '', PRIMARY KEY (ID), UNIQUE KEY user_login (user_login) Index: upgrade-functions.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** upgrade-functions.php 30 Jan 2005 07:34:03 -0000 1.87 --- upgrade-functions.php 2 Feb 2005 09:41:06 -0000 1.88 *************** *** 135,142 **** } - // First we need to enlarge option_value so it can hold larger values: - $wpdb->query("ALTER TABLE `$wpdb->options` CHANGE `option_value` `option_value` TEXT NOT NULL"); - - $wpdb->query("ALTER TABLE `$wpdb->comments` CHANGE `comment_author_url` `comment_author_url` VARCHAR( 200 ) NOT NULL"); } --- 135,138 ---- From saxmatt at users.sourceforge.net Wed Feb 2 10:37:01 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 10:37:11 2005 Subject: [wp-cvs] wordpress/wp-admin index.php, 1.16, 1.17 wp-admin.css, 1.83, 1.84 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25940/wp-admin Modified Files: index.php wp-admin.css Log Message: Tweaks to the dashboard planet display Index: wp-admin.css =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/wp-admin.css,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** wp-admin.css 1 Feb 2005 09:52:36 -0000 1.83 --- wp-admin.css 2 Feb 2005 10:36:59 -0000 1.84 *************** *** 14,17 **** --- 14,37 ---- } + #planetnews ul { + list-style: none; + margin: 0; + padding: 0; + } + + #planetnews li { + width: 16%; + margin: 1% 2%; + float: left; + } + + #planetnews li a { + display: block; + padding: .5em; + background: #ddd; + height: 6em; + overflow: hidden; + } + a.edit, a.delete, a.edit:hover, a.delete:hover { border-bottom: none; Index: index.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/index.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** index.php 1 Feb 2005 09:52:36 -0000 1.16 --- index.php 2 Feb 2005 10:36:59 -0000 1.17 *************** *** 89,93 **** if ( isset($rss->items) && 0 != count($rss->items) ) { ?> !

»

    --- 89,93 ---- if ( isset($rss->items) && 0 != count($rss->items) ) { ?> ! !
     
    +
get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author = $user_ID"); From saxmatt at users.sourceforge.net Wed Feb 2 10:39:53 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 10:40:03 2005 Subject: [wp-cvs] wordpress/wp-admin wp-admin.css,1.84,1.85 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26718/wp-admin Modified Files: wp-admin.css Log Message: Yay for IE Index: wp-admin.css =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/wp-admin.css,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** wp-admin.css 2 Feb 2005 10:36:59 -0000 1.84 --- wp-admin.css 2 Feb 2005 10:39:50 -0000 1.85 *************** *** 21,26 **** #planetnews li { ! width: 16%; ! margin: 1% 2%; float: left; } --- 21,26 ---- #planetnews li { ! width: 17%; ! margin: 1%; float: left; } From saxmatt at users.sourceforge.net Wed Feb 2 10:44:56 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 10:45:01 2005 Subject: [wp-cvs] wordpress/wp-admin edit-page-form.php,1.16,1.17 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27896/wp-admin Modified Files: edit-page-form.php Log Message: Don't show template dropdown if there's only one: http://mosquito.wordpress.org/view.php?id=530 Index: edit-page-form.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-page-form.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** edit-page-form.php 2 Jan 2005 00:09:05 -0000 1.16 --- edit-page-form.php 2 Feb 2005 10:44:53 -0000 1.17 *************** *** 84,87 **** --- 84,88 ---- + *************** *** 90,103 **** ! 7 && $users = $wpdb->get_results("SELECT ID, user_login, user_firstname, user_lastname FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?> ! + ! 7 && $users = $wpdb->get_results("SELECT ID, user_login, user_firstname, user_lastname FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?> !
:
: +
:
:
! --- 16,20 ----

!
From saxmatt at users.sourceforge.net Wed Feb 2 10:57:09 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 10:57:17 2005 Subject: [wp-cvs] wordpress/wp-content/themes/default searchform.php, 1.2, 1.3 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-content/themes/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30218/wp-content/themes/default Modified Files: searchform.php Log Message: GET clean - http://mosquito.wordpress.org/view.php?id=784 Index: searchform.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/default/searchform.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** searchform.php 24 Jan 2005 08:15:10 -0000 1.2 --- searchform.php 2 Feb 2005 10:57:07 -0000 1.3 *************** *** 1,5 ****
!
\ No newline at end of file --- 1,5 ----
!
\ No newline at end of file From emc3 at users.sourceforge.net Wed Feb 2 13:58:16 2005 From: emc3 at users.sourceforge.net (Ernest MacDougal Campbell III) Date: Wed Feb 2 13:58:25 2005 Subject: [wp-cvs] wordpress/wp-admin upgrade-schema.php,1.23,1.24 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2929/wp-admin Modified Files: upgrade-schema.php Log Message: Typo fix Index: upgrade-schema.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** upgrade-schema.php 2 Feb 2005 09:41:06 -0000 1.23 --- upgrade-schema.php 2 Feb 2005 13:58:14 -0000 1.24 *************** *** 6,10 **** cat_name varchar(55) NOT NULL default '', category_nicename varchar(200) NOT NULL default '', ! category_description lengtext NOT NULL, category_parent int(4) NOT NULL default '0', PRIMARY KEY (cat_ID), --- 6,10 ---- cat_name varchar(55) NOT NULL default '', category_nicename varchar(200) NOT NULL default '', ! category_description longtext NOT NULL, category_parent int(4) NOT NULL default '0', PRIMARY KEY (cat_ID), From saxmatt at users.sourceforge.net Wed Feb 2 22:52:49 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 22:52:56 2005 Subject: [wp-cvs] wordpress/wp-includes template-functions-post.php, 1.42, 1.43 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29164/wp-includes Modified Files: template-functions-post.php Log Message: Faster way to get_custom strings. Index: template-functions-post.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-post.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** template-functions-post.php 17 Jan 2005 20:16:22 -0000 1.42 --- template-functions-post.php 2 Feb 2005 22:52:47 -0000 1.43 *************** *** 245,248 **** --- 245,253 ---- } + function post_custom( $key = '' ) { + if ( 1 == count($post_meta_cache[$id][$key]) ) return $post_meta_cache[$id][$key][0]; + else return $post_meta_cache[$id][$key]; + } + // this will probably change at some point... function the_meta() { From saxmatt at users.sourceforge.net Wed Feb 2 22:53:54 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Wed Feb 2 22:54:00 2005 Subject: [wp-cvs] wordpress/wp-includes version.php,1.23,1.24 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29366/wp-includes Modified Files: version.php Log Message: Version bump Index: version.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-includes/version.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** version.php 30 Dec 2004 11:25:56 -0000 1.23 --- version.php 2 Feb 2005 22:53:52 -0000 1.24 *************** *** 3,7 **** // This just holds the version number, in a separate file so we can bump it without cluttering the CVS ! $wp_version = '1.5-beta-1'; ?> \ No newline at end of file --- 3,7 ---- // This just holds the version number, in a separate file so we can bump it without cluttering the CVS ! $wp_version = '1.5-gamma'; ?> \ No newline at end of file From saxmatt at users.sourceforge.net Thu Feb 3 04:52:50 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Thu Feb 3 04:53:02 2005 Subject: [wp-cvs] wordpress readme.html,1.30,1.31 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5696 Modified Files: readme.html Log Message: Bringing the readme up to date, somewhat. Index: readme.html =================================================================== RCS file: /cvsroot/cafelog/wordpress/readme.html,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** readme.html 20 Jan 2005 05:11:59 -0000 1.30 --- readme.html 3 Feb 2005 04:52:47 -0000 1.31 *************** *** 46,49 **** --- 46,72 ----

Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.

— Matt Mullenweg

+ +

Installation: Famous 5-minute install

+
    +
  1. Unzip the package in an empty directory
    2. +
  2. Open up wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details
    3. +
  3. Save the file as wp-config.php
    4. +
  4. Upload everything.
    5. +
  5. Launch /wp-admin/install.php in your browser. This should setup the tables needed for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
    6. +
  6. Note the password given to you.
    7. +
  7. The install script should then send you to the login page. Sign in with the username admin and the password generated during the installation. You can then click on 'Profile' to change the password.
    8. +
+ +

Upgrading

+

Before you upgrade anything, make sure you have backup copies of any files you may have modified such as index.php.

+

Upgrading from any previous WordPress to 1.5:

+
    +
  1. Delete your old WP files, saving ones you've modified
    2. +
  2. Upload the new files
    3. +
  3. Point your browser to /wp-admin/upgrade.php
    4. +
  4. You wanted more, perhaps? That's it!
    5. +
+

Template Changes

+

If you have customized your templates you will probably have to make some changes to them. If you're converting your 1.2 or earlier templates, we've created a special guide for you.

Online Resources

If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:

*************** *** 51,60 ****
The WordPress Codex
The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.
!
The official documentation
!
The documentation on wordpress.org represents the official resources we've made available. Beyond reference, this includes tutorials and guides for doing different things with WordPress. As I write this, it is a little sparse, but we're doing our best to enrich this resource so by the time you read this sentence the docs may be bursting with information.
The Development Blog
This is where you'll find the latest updates and news related to WordPress. Bookmark and check often.
!
Frequently Asked Questions Blog
!
In addition to the FAQ on the wiki and the main website, there is a new FAQ blog that several members of the documentation team are updating. The FAQ itself is run with WordPress.
WordPress Support Forums
If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
--- 74,82 ----
The WordPress Codex
The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.
!
 
The Development Blog
This is where you'll find the latest updates and news related to WordPress. Bookmark and check often.
!
WordPress Planet
!
The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.
WordPress Support Forums
If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
*************** *** 62,65 **** --- 84,88 ----
Finally, there is an online chat channel that is used for discussion amoung people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpresss)
+

System Recommendations

    *************** *** 69,120 ****

WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

!

Installation: Famous 5-minute install

!
    !
  1. Unzip the package in an empty directory
    2. !
  2. Open up wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details
    3. !
  3. Save the file as wp-config.php
    4. !
  4. Upload everything.
    5. !
  5. Launch /wp-admin/install.php in your browser. This should setup the tables needed for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
    6. !
  6. Note the password given to you.
    7. !
  7. The install script should then send you to the login page. Sign in with the username admin and the password generated during the installation. You can then click on 'Profile' to change the password.
    8. !
!

Upgrading

!

Before you upgrade anything, make sure you have backup copies of any files you may have modified such as index.php.

!

Upgrading from any previous WordPress to 1.5:

!
    !
  1. Upload the new files, and be careful not to overwrite anything important
    2. !
  2. Point your browser to /wp-admin/upgrade.php
    3. !
  3. You wanted more, perhaps? That's it!
    4. !
!

If you are coming from 1.0 or greater, your existing templates should work perfectly with just one change to the way you call comments. If you are coming from a version earlier than 1.0 you will need to modify your templates slightly. Use the default index.php as your guide.

Upgrading from another system

WordPress can import from a number of systems. First you need to get WordPress installed and working as described above.

!

Templates

!

The template tags are too numerous and flexible to adequetely document here, so please see our online documentation.

!

Themes

!

Themes are a new way to switch the look and function of your site with just a click. TODO

!

Plugins

!

TODO

!

Query String Usage

!

WordPress can be manipulated quite a bit through the query string. To pass variables in the querystring, proceed the first variable name with a '?' question mark and every other variables with a '&' sign. You may never use this, but it is useful to know.

!

index.php?m=200107 will display the month of July 2001.

!

index.php?m=20010701 will display all posts from July 1st, 2001.

!

index.php?w=20 will display the posts from the 20th week of the year, where January 1st is in the first week (according to PHP).

!

index.php?p=50 will display the post labeled #50 in the database.

!

index.php?s=blue+house will display the posts that match the search request "blue house".

!

index.php?cat=1 will display all posts that belong to category #1 (1 is the default). you can add/rename/delete categories from WordPress's interface.

!

index.php?author=1 will display all posts from the author #1

!

index.php?p=50&page=1 will display the first page of post #50. this, again, should be used only with p=, for individual entries.

!

You can also mix these variables, example: index.php?m=200107&s=hotdog will display the posts that match the search request "hotdog", but only in July 2001.

!

XML-RPC Interface

WordPress has an XMLRPC interface. We currently support the Blogger API, metaWeblog API, and the MovableType API.

-

The Blogger API has been completely emulated on WordPress, with some little differences:

-
    -
  • using blogger.getRecentPosts with the number 'zero' returns all posts in the blog
    • -
  • blogger.getTemplate fetches your file $blogfilename (as specified in the config), while blogger.setTemplate overwrites it with the edited data
    • -
  • blogger.getUsersBlogs is a dummy function that returns '1' and $blogname, since WordPress supports only one blog as of now
    • -
-

If you use blogger.newPost, your post is submitted without title and in category #1.

-

However, you can type <title>my title</title> and/or <category>2<category> in the body of your post to make its title be 'my title' and its category be #2 (refer to your categories section to find out the ID numbers of the categories). WordPress would then delete that extra info from the body of your post once it is posted.

The metaWeblog and MovableType APIs are currently supported with the following exceptions:

    --- 92,100 ----

WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

!

Upgrading from another system

WordPress can import from a number of systems. First you need to get WordPress installed and working as described above.

!

XML-RPC Interface

WordPress has an XMLRPC interface. We currently support the Blogger API, metaWeblog API, and the MovableType API.

The metaWeblog and MovableType APIs are currently supported with the following exceptions:

    From saxmatt at users.sourceforge.net Thu Feb 3 19:13:14 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Thu Feb 3 19:13:20 2005 Subject: [wp-cvs] wordpress/wp-admin edit.php,1.41,1.42 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7139/wp-admin Modified Files: edit.php Log Message: Don't show spam in list Index: edit.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** edit.php 24 Jan 2005 07:39:23 -0000 1.41 --- edit.php 3 Feb 2005 19:13:11 -0000 1.42 *************** *** 168,172 **** if ( 1 == count($posts) ) { ! $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id ORDER BY comment_date"); if ($comments) { ?> --- 168,172 ---- if ( 1 == count($posts) ) { ! $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_status != 'spam' ORDER BY comment_date"); if ($comments) { ?> From saxmatt at users.sourceforge.net Thu Feb 3 19:16:18 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Thu Feb 3 19:16:23 2005 Subject: [wp-cvs] wordpress/wp-content/plugins staticize-reloaded.php, 1.7, NONE Message-ID: Update of /cvsroot/cafelog/wordpress/wp-content/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7629/wp-content/plugins Removed Files: staticize-reloaded.php Log Message: Removing Staticize --- staticize-reloaded.php DELETED --- From saxmatt at users.sourceforge.net Fri Feb 4 22:55:13 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Fri Feb 4 22:55:22 2005 Subject: [wp-cvs] wordpress/wp-admin upgrade-schema.php,1.24,1.25 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15748/wp-admin Modified Files: upgrade-schema.php Log Message: Be a little more forward-looking Index: upgrade-schema.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** upgrade-schema.php 2 Feb 2005 13:58:14 -0000 1.24 --- upgrade-schema.php 4 Feb 2005 22:55:11 -0000 1.25 *************** *** 3,7 **** $wp_queries="CREATE TABLE $wpdb->categories ( ! cat_ID int(4) NOT NULL auto_increment, cat_name varchar(55) NOT NULL default '', category_nicename varchar(200) NOT NULL default '', --- 3,7 ---- $wp_queries="CREATE TABLE $wpdb->categories ( ! cat_ID bigint(20) NOT NULL auto_increment, cat_name varchar(55) NOT NULL default '', category_nicename varchar(200) NOT NULL default '', *************** *** 12,16 **** ); CREATE TABLE $wpdb->comments ( ! comment_ID int(11) unsigned NOT NULL auto_increment, comment_post_ID int(11) NOT NULL default '0', comment_author tinytext NOT NULL, --- 12,16 ---- ); CREATE TABLE $wpdb->comments ( ! comment_ID bigint(20) unsigned NOT NULL auto_increment, comment_post_ID int(11) NOT NULL default '0', comment_author tinytext NOT NULL, *************** *** 32,36 **** ); CREATE TABLE $wpdb->linkcategories ( ! cat_id int(11) NOT NULL auto_increment, cat_name tinytext NOT NULL, auto_toggle enum('Y','N') NOT NULL default 'N', --- 32,36 ---- ); CREATE TABLE $wpdb->linkcategories ( ! cat_id bigint(20) NOT NULL auto_increment, cat_name tinytext NOT NULL, auto_toggle enum('Y','N') NOT NULL default 'N', *************** *** 48,52 **** ); CREATE TABLE $wpdb->links ( ! link_id int(11) NOT NULL auto_increment, link_url varchar(255) NOT NULL default '', link_name varchar(255) NOT NULL default '', --- 48,52 ---- ); CREATE TABLE $wpdb->links ( ! link_id bigint(20) NOT NULL auto_increment, link_url varchar(255) NOT NULL default '', link_name varchar(255) NOT NULL default '', *************** *** 67,71 **** ); CREATE TABLE $wpdb->options ( ! option_id int(11) NOT NULL auto_increment, blog_id int(11) NOT NULL default '0', option_name varchar(64) NOT NULL default '', --- 67,71 ---- ); CREATE TABLE $wpdb->options ( ! option_id bigint(20) NOT NULL auto_increment, blog_id int(11) NOT NULL default '0', option_name varchar(64) NOT NULL default '', *************** *** 82,94 **** ); CREATE TABLE $wpdb->post2cat ( ! rel_id int(11) NOT NULL auto_increment, ! post_id int(11) NOT NULL default '0', ! category_id int(11) NOT NULL default '0', PRIMARY KEY (rel_id), KEY post_id (post_id,category_id) ); CREATE TABLE $wpdb->postmeta ( ! meta_id int(11) NOT NULL auto_increment, ! post_id int(11) NOT NULL default '0', meta_key varchar(255) default NULL, meta_value text, --- 82,94 ---- ); CREATE TABLE $wpdb->post2cat ( ! rel_id bigint(20) NOT NULL auto_increment, ! post_id bigint(20) NOT NULL default '0', ! category_id bigint(20) NOT NULL default '0', PRIMARY KEY (rel_id), KEY post_id (post_id,category_id) ); CREATE TABLE $wpdb->postmeta ( ! meta_id bigint(20) NOT NULL auto_increment, ! post_id bigint(20) NOT NULL default '0', meta_key varchar(255) default NULL, meta_value text, *************** *** 98,102 **** ); CREATE TABLE $wpdb->posts ( ! ID int(11) unsigned NOT NULL auto_increment, post_author int(4) NOT NULL default '0', post_date datetime NOT NULL default '0000-00-00 00:00:00', --- 98,102 ---- ); CREATE TABLE $wpdb->posts ( ! ID bigint(20) unsigned NOT NULL auto_increment, post_author int(4) NOT NULL default '0', post_date datetime NOT NULL default '0000-00-00 00:00:00', *************** *** 123,128 **** ); CREATE TABLE $wpdb->users ( ! ID int(10) unsigned NOT NULL auto_increment, ! user_login varchar(20) NOT NULL default '', user_pass varchar(64) NOT NULL default '', user_firstname varchar(50) NOT NULL default '', --- 123,128 ---- ); CREATE TABLE $wpdb->users ( ! ID bigint(20) unsigned NOT NULL auto_increment, ! user_login varchar(60) NOT NULL default '', user_pass varchar(64) NOT NULL default '', user_firstname varchar(50) NOT NULL default '', From saxmatt at users.sourceforge.net Fri Feb 4 23:52:59 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Fri Feb 4 23:53:03 2005 Subject: [wp-cvs] wordpress/wp-admin install.php,1.54,1.55 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29093/wp-admin Modified Files: install.php Log Message: First user should have a registration date. Index: install.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/install.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** install.php 24 Jan 2005 07:44:38 -0000 1.54 --- install.php 4 Feb 2005 23:52:56 -0000 1.55 *************** *** 160,164 **** // Set up admin user $random_password = substr(md5(uniqid(microtime())), 0, 6); ! $wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_nickname, user_email, user_level, user_idmode) VALUES ( '1', 'admin', MD5('$random_password'), 'Administrator', '$admin_email', '10', 'nickname')"); $from = 'From: '.$_POST['weblog_title'].' '; --- 160,164 ---- // Set up admin user $random_password = substr(md5(uniqid(microtime())), 0, 6); ! $wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_nickname, user_email, user_level, user_idmode, user_registered) VALUES ( '1', 'admin', MD5('$random_password'), 'Administrator', '$admin_email', '10', 'nickname', NOW() )"); $from = 'From: '.$_POST['weblog_title'].' '; From saxmatt at users.sourceforge.net Sat Feb 5 02:19:02 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Sat Feb 5 02:19:17 2005 Subject: [wp-cvs] wordpress wp-login.php, 1.56, 1.57 wp-register.php, 1.24, 1.25 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25061 Modified Files: wp-login.php wp-register.php Log Message: Big buttons for login and registration, more robust registration and password recovery. Index: wp-login.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** wp-login.php 24 Jan 2005 07:30:49 -0000 1.56 --- wp-login.php 5 Feb 2005 02:19:00 -0000 1.57 *************** *** 48,51 **** --- 48,56 ---- window.onload = focusit; + *************** *** 61,69 ****

    !
    !

    !

    --- 66,83 ----

    !

    !


    !

    +
      +
    • «
      • + +
      • + +
      • +
    *************** *** 73,77 **** case 'retrievepassword': - $user_data = get_userdatabylogin($_POST['user_login']); // redefining user_login ensures we return the right case in the email --- 87,90 ---- *************** *** 83,94 **** // Generate something random for a password... md5'ing current time with a rand salt ! $user_pass = substr(md5(uniqid(microtime())), 0, 6); // now insert the new pass md5'd into the db ! $wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$user_pass') WHERE user_login = '$user_login'"); $message = __('Login') . ": $user_login\r\n"; ! $message .= __('Password') . ": $user_pass\r\n"; $message .= get_settings('siteurl') . '/wp-login.php'; ! $m = wp_mail($user_email, sprintf(__("[%s] Your login and password"), get_settings('blogname')), $message); if ($m == false) { --- 96,136 ---- // Generate something random for a password... md5'ing current time with a rand salt ! $key = substr( md5( uniqid( microtime() ) ), 0, 50); // now insert the new pass md5'd into the db ! $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); ! $message .= __("Someone has asked to reset a password for the login this site\n\n " . get_option('siteurl') ) . "\n\n"; ! $message .= __('Login') . ": $user_login\r\n\r\n"; ! $message .= __("To reset your password visit the following address, otherwise just ignore this email and nothing will happen.\n\n"); ! $message .= get_settings('siteurl') . "/wp-login.php?action=resetpass&key=$key"; ! mail($user_email, sprintf(__("[%s] Password Reset"), get_settings('blogname')), $message); ! $m = wp_mail($user_email, sprintf(__("[%s] Password Reset"), get_settings('blogname')), $message); ! ! if ($m == false) { ! echo '

    ' . __('The e-mail could not be sent.') . "
    \n"; ! echo __('Possible reason: your host may have disabled the mail() function...') . "

    "; ! die(); ! } else { ! echo '

    ' . sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '
    '; ! echo "" . __('Click here to login!') . '

    '; ! die(); ! } ! ! break; ! ! case 'resetpass' : ! ! // Generate something random for a password... md5'ing current time with a rand salt ! $key = $_GET['key']; ! $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'"); ! if ( !$user ) ! die( __('Sorry, that key does not appear to be valid.') ); ! ! $new_pass = md5( substr( md5( uniqid( microtime() ) ), 0, 7) ); ! $wpdb->query("UPDATE $wpdb->users SET user_pass = '$new_pass', user_activation_key = '' WHERE user_login = '$user->user_login'"); $message = __('Login') . ": $user_login\r\n"; ! $message .= __('Password') . ": $new_pass\r\n"; $message .= get_settings('siteurl') . '/wp-login.php'; ! $m = wp_mail($user->user_email, sprintf(__("[%s] Your new password"), get_settings('blogname')), $message); if ($m == false) { *************** *** 97,107 **** die(); } else { ! echo '

    ' . sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '
    '; echo "" . __('Click here to login!') . '

    '; // send a copy of password change notification to the admin wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login)); - die(); - } - break; --- 139,149 ---- die(); } else { ! echo '

    ' . sprintf(__("Your new password is in the mail."), $user_login) . '
    '; echo "" . __('Click here to login!') . '

    '; + die(); + } + // send a copy of password change notification to the admin wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login)); break; *************** *** 159,162 **** --- 201,209 ---- window.onload = focusit; + *************** *** 170,177 ****
    !

    !

    !

    --- 217,224 ---- !

    !

    !

    Index: wp-register.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-register.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wp-register.php 24 Dec 2004 01:34:47 -0000 1.24 --- wp-register.php 5 Feb 2005 02:19:00 -0000 1.25 *************** *** 27,32 **** $user_login = $_POST['user_login']; - $pass1 = $_POST['pass1']; - $pass2 = $_POST['pass2']; $user_email = $_POST['user_email']; --- 27,30 ---- *************** *** 36,50 **** } - /* checking the password has been typed twice */ - if ($pass1 == '' || $pass2 == '') { - die (__('ERROR: Please enter your password twice.')); - } - - /* checking the password has been typed twice the same */ - if ($pass1 != $pass2) { - die (__('ERROR: Please type the same password in the two password fields.')); - } - $user_nickname = $user_login; - /* checking e-mail address */ if ($user_email == '') { --- 34,37 ---- *************** *** 64,78 **** $user_browser = $wpdb->escape($_SERVER['HTTP_USER_AGENT']); ! $user_login = $wpdb->escape($user_login); ! $pass1 = $wpdb->escape($pass1); ! $user_nickname = $wpdb->escape($user_nickname); ! $user_nicename = sanitize_title($user_nickname); $now = gmdate('Y-m-d H:i:s'); if (get_settings('new_users_can_blog') >= 1) $user_level = 1; $result = $wpdb->query("INSERT INTO $wpdb->users (user_login, user_pass, user_nickname, user_email, user_ip, user_browser, user_registered, user_level, user_idmode, user_nicename) VALUES ! ('$user_login', MD5('$pass1'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$user_level', 'nickname', '$user_nicename')"); if ($result == false) { --- 51,65 ---- $user_browser = $wpdb->escape($_SERVER['HTTP_USER_AGENT']); ! $user_login = $wpdb->escape( preg_replace('|a-z0-9 _.-|i', '', $user_login) ); ! $user_nickname = $user_login; ! $user_nicename = sanitize_title($user_nickname); $now = gmdate('Y-m-d H:i:s'); if (get_settings('new_users_can_blog') >= 1) $user_level = 1; + $password = substr( md5( uniqid( microtime() ) ), 0, 7); $result = $wpdb->query("INSERT INTO $wpdb->users (user_login, user_pass, user_nickname, user_email, user_ip, user_browser, user_registered, user_level, user_idmode, user_nicename) VALUES ! ('$user_login', MD5('$password'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$user_level', 'nickname', '$user_nicename')"); if ($result == false) { *************** *** 84,87 **** --- 71,80 ---- $stars .= '*'; } + + $message = __('Login') . ": $user_login\r\n"; + $message .= __('Password') . ": $new_pass\r\n"; + $message .= get_settings('siteurl') . '/wp-login.php'; + + wp_mail($user_email, sprintf(__("[%s] Your login information"), get_settings('blogname')), $message); $message = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email); *************** *** 102,106 ****


    !

    --- 95,99 ----


    ! emailed to you

    *************** *** 150,168 ****
    !

    ! ! !
    !
    ! !
    ! :
    !
    --- 143,170 ---- +
    !

    WordPress

    !

    !
    !

    !

    !

    :

    !

    A password will be emailed to you.

    !

    +
    From saxmatt at users.sourceforge.net Sat Feb 5 02:19:02 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Sat Feb 5 02:19:21 2005 Subject: [wp-cvs] wordpress/wp-admin wp-admin.css,1.85,1.86 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25061/wp-admin Modified Files: wp-admin.css Log Message: Big buttons for login and registration, more robust registration and password recovery. Index: wp-admin.css =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/wp-admin.css,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** wp-admin.css 2 Feb 2005 10:39:50 -0000 1.85 --- wp-admin.css 5 Feb 2005 02:18:59 -0000 1.86 *************** *** 206,210 **** } ! .submit, #quicktags, .editform th, #postcustomsubmit, #login form { text-align: right; } --- 206,210 ---- } ! .submit, #quicktags, .editform th, #postcustomsubmit { text-align: right; } From saxmatt at users.sourceforge.net Sat Feb 5 02:22:38 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Sat Feb 5 02:23:06 2005 Subject: [wp-cvs] wordpress wp-login.php, 1.57, 1.58 wp-register.php, 1.25, 1.26 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25773 Modified Files: wp-login.php wp-register.php Log Message: I almost forgot the hook Index: wp-login.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wp-login.php 5 Feb 2005 02:19:00 -0000 1.57 --- wp-login.php 5 Feb 2005 02:22:36 -0000 1.58 *************** *** 23,26 **** --- 23,27 ---- wp_clearcookie(); + do_action('wp_logout'); header('Expires: Mon, 11 Jan 1984 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); *************** *** 106,109 **** --- 107,112 ---- $m = wp_mail($user_email, sprintf(__("[%s] Password Reset"), get_settings('blogname')), $message); + do_action('retreive_password', $user_login); + if ($m == false) { echo '

    ' . __('The e-mail could not be sent.') . "
    \n"; *************** *** 134,137 **** --- 137,142 ---- $m = wp_mail($user->user_email, sprintf(__("[%s] Your new password"), get_settings('blogname')), $message); + do_action('password_reset'); + if ($m == false) { echo '

    ' . __('The e-mail could not be sent.') . "
    \n"; *************** *** 178,182 **** wp_setcookie($user_login, $user_pass); } ! header("Location: $redirect_to"); exit(); --- 183,187 ---- wp_setcookie($user_login, $user_pass); } ! do_action('wp_login', $user_login); header("Location: $redirect_to"); exit(); Index: wp-register.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-register.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wp-register.php 5 Feb 2005 02:19:00 -0000 1.25 --- wp-register.php 5 Feb 2005 02:22:36 -0000 1.26 *************** *** 62,66 **** VALUES ('$user_login', MD5('$password'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$user_level', 'nickname', '$user_nicename')"); ! if ($result == false) { die (sprintf(__('ERROR: Couldn’t register you... please contact the webmaster !'), get_settings('admin_email'))); --- 62,68 ---- VALUES ('$user_login', MD5('$password'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$user_level', 'nickname', '$user_nicename')"); ! ! do_action('user_register', $wpdb->insert_id); ! if ($result == false) { die (sprintf(__('ERROR: Couldn’t register you... please contact the webmaster !'), get_settings('admin_email'))); From saxmatt at users.sourceforge.net Sat Feb 5 04:26:16 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Sat Feb 5 04:26:20 2005 Subject: [wp-cvs] wordpress readme.html,1.31,1.32 Message-ID: Update of /cvsroot/cafelog/wordpress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13362 Modified Files: readme.html Log Message: Extra dt Index: readme.html =================================================================== RCS file: /cvsroot/cafelog/wordpress/readme.html,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** readme.html 3 Feb 2005 04:52:47 -0000 1.31 --- readme.html 5 Feb 2005 04:26:13 -0000 1.32 *************** *** 74,78 ****

    The WordPress Codex
    The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.
    -
     
    The Development Blog
    This is where you'll find the latest updates and news related to WordPress. Bookmark and check often.
    --- 74,77 ---- From saxmatt at users.sourceforge.net Sat Feb 5 04:53:22 2005 From: saxmatt at users.sourceforge.net (Matthew Mullenweg) Date: Sat Feb 5 04:53:39 2005 Subject: [wp-cvs] wordpress/wp-admin menu.php,1.38,1.39 Message-ID: Update of /cvsroot/cafelog/wordpress/wp-admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17512/wp-admin Modified Files: menu.php Log Message: A little reorg Index: menu.php =================================================================== RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** menu.php 10 Jan 2005 04:03:51 -0000 1.38 --- menu.php 5 Feb 2005 04:53:19 -0000 1.39 *************** *** 9,16 **** $menu[10] = array(__('Manage'), 1, 'edit.php'); $menu[20] = array(__('Links'), 5, 'link-manager.php'); ! $menu[25] = array(__('Users'), 0, 'profile.php'); ! $menu[30] = array(__('Options'), 6, 'options-general.php'); ! $menu[35] = array(__('Plugins'), 8, 'plugins.php'); ! $menu[40] = array(__('Presentation'), 8, 'themes.php'); if ( get_option('use_fileupload') ) $menu[45] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php'); --- 9,17 ---- $menu[10] = array(__('Manage'), 1, 'edit.php'); $menu[20] = array(__('Links'), 5, 'link-manager.php'); ! $menu[25] = array(__('Presentation'), 8, 'themes.php'); ! $menu[30] = array(__('Plugins'), 8, 'plugins.php'); ! $menu[35] = array(__('