From rboren at users.sourceforge.net  Wed Jan  5 21:11:45 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Wed Jan  5 21:11:54 2005
Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.22,1.23
Message-ID: <E1CmIRV-0006mt-Sf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26083

Modified Files:
	functions-post.php 
Log Message:
Add preprocess_comment filter to enable filtering all comment data in one go.  Patch from MooKitty.

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** functions-post.php	1 Jan 2005 23:13:38 -0000	1.22
--- functions-post.php	5 Jan 2005 21:11:42 -0000	1.23
***************
*** 390,393 ****
--- 390,394 ----
  	global $wpdb;
  
+ 	$commentdata = apply_filters('preprocess_comment', $commentdata);
  	extract($commentdata);
  
***************
*** 487,489 ****
  }
  
! ?>
\ No newline at end of file
--- 488,490 ----
  }
  
! ?>

From rboren at users.sourceforge.net  Wed Jan  5 21:57:55 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Wed Jan  5 21:58:01 2005
Subject: [wp-cvs] wordpress/wp-admin upgrade-functions.php,1.84,1.85
Message-ID: <E1CmJAB-0001A8-NQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4452

Modified Files:
	upgrade-functions.php 
Log Message:
Update stylesheet and comments references when upgrading old templates.

Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** upgrade-functions.php	4 Jan 2005 22:46:45 -0000	1.84
--- upgrade-functions.php	5 Jan 2005 21:57:51 -0000	1.85
***************
*** 564,567 ****
--- 564,574 ----
  						$line = '//' . $line;
  				}
+ 
+ 				// Update stylesheet references.
+ 				$line = str_replace("<?php echo get_settings('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
+ 
+ 				// Update comments template inclusion.
+ 				$line = str_replace("<?php include(ABSPATH . 'wp-comments.php'); ?>", "<?php comments_template(); ?>", $line);
+ 
  				fwrite($f, "{$line}\n");
  			}

From saxmatt at users.sourceforge.net  Thu Jan  6 09:29:07 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 09:29:14 2005
Subject: [wp-cvs] wordpress/wp-admin post.php,1.116,1.117
Message-ID: <E1CmTx6-0004iX-0G@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18114/wp-admin

Modified Files:
	post.php 
Log Message:
Show feedback that the post was saved.

Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** post.php	2 Jan 2005 00:09:05 -0000	1.116
--- post.php	6 Jan 2005 09:29:04 -0000	1.117
***************
*** 631,635 ****
  	$title = __('Create New Post');
  	require_once ('./admin-header.php');
! 
  	if (user_can_create_draft($user_ID)) {
  		$action = 'post';
--- 631,639 ----
  	$title = __('Create New Post');
  	require_once ('./admin-header.php');
! ?>
! <?php if ( isset($_GET['posted']) ) : ?>
! <div class="updated"><p>Post saved. <a href="<?php bloginfo('home'); ?>">View site &raquo;</a></p></div>
! <?php endif; ?>
! <?php
  	if (user_can_create_draft($user_ID)) {
  		$action = 'post';

From saxmatt at users.sourceforge.net  Thu Jan  6 09:47:10 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 09:47:17 2005
Subject: [wp-cvs] wordpress/wp-admin link-add.php, 1.20,
	1.21 link-manager.php, 1.43, 1.44
Message-ID: <E1CmUEY-0005bz-IK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21510/wp-admin

Modified Files:
	link-add.php link-manager.php 
Log Message:
Fixes to XFN creator

Index: link-manager.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-manager.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** link-manager.php	15 Dec 2004 23:09:45 -0000	1.43
--- link-manager.php	6 Jan 2005 09:46:52 -0000	1.44
***************
*** 347,358 ****
                <th scope="row"> <?php _e('friendship') ?> </th>
                <td>
!                 <label for="label">
!                 <input class="valinp" type="radio" name="friendship" value="acquaintance" id="label" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
!                 <label for="label2">
!                 <input class="valinp" type="radio" name="friendship" value="contact" id="label2" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
!                 <label for="label3">
!                 <input class="valinp" type="radio" name="friendship" value="friend" id="label3" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
!                 <label for="label4">
!                 <input name="friendship" type="radio" class="valinp" id="label4" value="" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
                </td>
              </tr>
--- 347,358 ----
                <th scope="row"> <?php _e('friendship') ?> </th>
                <td>
!                 <label for="acquaintance">
!                 <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
!                 <label for="contact">
!                 <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
!                 <label id="friend">
!                 <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
!                 <label for="friendship">
!                 <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
                </td>
              </tr>
***************
*** 360,365 ****
                <th scope="row"> <?php _e('physical') ?> </th>
                <td>
!                 <label for="label10">
!                 <input class="valinp" type="checkbox" name="physical" value="met" id="label10" <?php xfn_check('physical', 'met'); ?> />
            <?php _e('met') ?></label>
                </td>
--- 360,365 ----
                <th scope="row"> <?php _e('physical') ?> </th>
                <td>
!                 <label for="met">
!                 <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
            <?php _e('met') ?></label>
                </td>
***************
*** 368,376 ****
                <th scope="row"> <?php _e('professional') ?> </th>
                <td>
!                 <label for="label20">
!                 <input class="valinp" type="checkbox" name="professional" value="co-worker" id="label20" <?php xfn_check('professional', 'co-worker'); ?> />
            <?php _e('co-worker') ?></label>
!                 <label for="label21">
!                 <input class="valinp" type="checkbox" name="professional" value="colleague" id="label21" <?php xfn_check('professional', 'colleague'); ?> />
            <?php _e('colleague') ?></label>
                </td>
--- 368,376 ----
                <th scope="row"> <?php _e('professional') ?> </th>
                <td>
!                 <label for="co-worker">
!                 <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
            <?php _e('co-worker') ?></label>
!                 <label for="colleague">
!                 <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
            <?php _e('colleague') ?></label>
                </td>
***************
*** 379,390 ****
                <th scope="row"> <?php _e('geographical') ?> </th>
                <td>
!                 <label for="label30">
!                 <input class="valinp" type="radio" name="geographical" value="co-resident" id="label30" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
            <?php _e('co-resident') ?></label>
!                 <label for="label31">
!                 <input class="valinp" type="radio" name="geographical" value="neighbor" id="label31" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
            <?php _e('neighbor') ?></label>
!                 <label for="label32">
!                 <input class="valinp" type="radio" name="geographical" value="" id="label32" <?php xfn_check('geographical', '', 'radio'); ?> />
            <?php _e('none') ?></label>
                </td>
--- 379,390 ----
                <th scope="row"> <?php _e('geographical') ?> </th>
                <td>
!                 <label for="co-resident">
!                 <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
            <?php _e('co-resident') ?></label>
!                 <label for="neighbor">
!                 <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
            <?php _e('neighbor') ?></label>
!                 <label for="geographical">
!                 <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
            <?php _e('none') ?></label>
                </td>
***************
*** 393,413 ****
                <th scope="row"> family </th>
                <td>
!                 <label for="label40">
!                 <input class="valinp" type="radio" name="family" value="child" id="label40" <?php xfn_check('family', 'child', 'radio'); ?>  />
            <?php _e('child') ?></label>
!                 <label for="label41">
!                 <input class="valinp" type="radio" name="family" value="kin" id="label41" <?php xfn_check('family', 'kin', 'radio'); ?>  />
            <?php _e('kin') ?></label>
!                 <label for="label42">
!                 <input class="valinp" type="radio" name="family" value="parent" id="label42" <?php xfn_check('family', 'parent', 'radio'); ?> />
            <?php _e('parent') ?></label>
!                 <label for="label43">
!                 <input class="valinp" type="radio" name="family" value="sibling" id="label43" <?php xfn_check('family', 'sibling', 'radio'); ?> />
            <?php _e('sibling') ?></label>
!                 <label for="label44">
!                 <input class="valinp" type="radio" name="family" value="spouse" id="label44" <?php xfn_check('family', 'spouse', 'radio'); ?> />
            <?php _e('spouse') ?></label>
!                 <label for="label45">
!                 <input class="valinp" type="radio" name="family" value="" id="label45" <?php xfn_check('family', '', 'radio'); ?> />
            <?php _e('none') ?></label>
                </td>
--- 393,413 ----
                <th scope="row"> family </th>
                <td>
!                 <label for="child">
!                 <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
            <?php _e('child') ?></label>
!                 <label for="kin">
!                 <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
            <?php _e('kin') ?></label>
!                 <label for="parent">
!                 <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
            <?php _e('parent') ?></label>
!                 <label for="sibling">
!                 <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
            <?php _e('sibling') ?></label>
!                 <label for="spouse">
!                 <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
            <?php _e('spouse') ?></label>
!                 <label for="family">
!                 <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
            <?php _e('none') ?></label>
                </td>
***************
*** 416,430 ****
                <th scope="row"> <?php _e('romantic') ?> </th>
                <td>
!                 <label for="label50">
!                 <input class="valinp" type="checkbox" name="romantic" value="muse" id="label50" <?php xfn_check('romantic', 'muse'); ?> />
           <?php _e('muse') ?></label>
!                 <label for="label51">
!                 <input class="valinp" type="checkbox" name="romantic" value="crush" id="label51" <?php xfn_check('romantic', 'crush'); ?> />
           <?php _e('crush') ?></label>
!                 <label for="label52">
!                 <input class="valinp" type="checkbox" name="romantic" value="date" id="label52" <?php xfn_check('romantic', 'date'); ?> />
           <?php _e('date') ?></label>
!                 <label for="label53">
!                 <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="label53" <?php xfn_check('romantic', 'sweetheart'); ?> />
           <?php _e('sweetheart') ?></label>
                </td>
--- 416,430 ----
                <th scope="row"> <?php _e('romantic') ?> </th>
                <td>
!                 <label for="muse">
!                 <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
           <?php _e('muse') ?></label>
!                 <label for="crush">
!                 <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
           <?php _e('crush') ?></label>
!                 <label for="date">
!                 <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
           <?php _e('date') ?></label>
!                 <label for="romantic">
!                 <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
           <?php _e('sweetheart') ?></label>
                </td>

Index: link-add.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-add.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** link-add.php	12 Dec 2004 20:41:14 -0000	1.20
--- link-add.php	6 Jan 2005 09:46:51 -0000	1.21
***************
*** 23,26 ****
--- 23,42 ----
  }
  
+ function xfn_check($class, $value = '', $type = 'check') {
+ 	global $link_rel;
+ 	$rels = preg_split('/\s+/', $link_rel);
+ 
+ 	if ('' != $value && in_array($value, $rels) ) {
+ 		echo ' checked="checked"';
+ 	}
+ 
+ 	if ('' == $value) {
+ 		if ('family' == $class && !strstr($link_rel, 'child') && !strstr($link_rel, 'parent') && !strstr($link_rel, 'sibling') && !strstr($link_rel, 'spouse') && !strstr($link_rel, 'kin')) echo ' checked="checked"';
+ 		if ('friendship' == $class && !strstr($link_rel, 'friend') && !strstr($link_rel, 'acquaintance') && !strstr($link_rel, 'contact') ) echo ' checked="checked"';
+ 		if ('geographical' == $class && !strstr($link_rel, 'co-resident') && !strstr($link_rel, 'neighbor') ) echo ' checked="checked"';
+ 		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+ 	}
+ }
+ 
  $wpvarstoreset = array('action', 'cat_id', 'linkurl', 'name', 'image',
                         'description', 'visible', 'target', 'category', 'link_id',
***************
*** 83,186 ****
          <table class="editform" width="100%" cellspacing="2" cellpadding="5">
              <tr>
!             	<th width="33%" scope="row"><?php _e('rel:') ?></th>
!             	<td width="67%"><input type="text" name="rel" id="rel" size="50" value="" /></td>
             	</tr>
              <tr>
!             	<th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
!             	<td><table cellpadding="3" cellspacing="5">
!             			<tr>
!             				<th scope="row"> <?php _e('friendship') ?> </th>
!             				<td>
!             				<label for="label1">
! 							<input class="valinp" type="radio" name="friendship" value="acquaintance" id="label1" />
! 							<?php _e('acquaintance') ?></label>
! 							<label for="label2">
! 							<input class="valinp" type="radio" name="friendship" value="contact" id="label2" />
! 							<?php _e('contact') ?></label>
! 							<label for="label3">
! 							<input class="valinp" type="radio" name="friendship" value="friend" id="label3" />
! 							<?php _e('friend') ?></label>
! 							<label for="label4">
!                 					<input class="valinp" type="radio" name="friendship" value="" id="label4" />
! 					<?php _e('none') ?></label>
!             					</td>
!            				</tr>
!             			<tr>
!             				<th scope="row"> <?php _e('physical') ?> </th>
!             				<td><label for="label10">
!             					<input class="valinp" type="checkbox" name="physical" value="met" id="label10" />
! 					<?php _e('met') ?></label>
!             					</td>
!            				</tr>
!             			<tr>
!             				<th scope="row"> <?php _e('professional') ?> </th>
!             				<td><label for="label20">
!             					<input class="valinp" type="checkbox" name="professional" value="co-worker" id="label20" />
! 					<?php _e('co-worker') ?></label>
!                 					<label for="label21">
!                 					<input class="valinp" type="checkbox" name="professional" value="colleague" id="label21" />
! 					<?php _e('colleague') ?></label>
!             					</td>
!            				</tr>
!             			<tr>
!             				<th scope="row"> <?php _e('geographical') ?> </th>
!             				<td><label for="label30">
!             					<input class="valinp" type="radio" name="geographical" value="co-resident" id="label30" />
! 					<?php _e('co-resident') ?></label>
!                 					<label for="label31">
!                 					<input class="valinp" type="radio" name="geographical" value="neighbor" id="label31" />
! 					<?php _e('neighbor') ?></label>
!                 					<label for="label32">
!                 					<input class="valinp" type="radio" name="geographical" value="" id="label32" />
! 					<?php _e('none') ?></label>
!             					</td>
!            				</tr>
!             			<tr>
!             				<th scope="row"> <?php _e('family') ?> </th>
!             				<td>
!             						<label for="label40">
!             					<input class="valinp" type="radio" name="family" value="child" id="label40" />
! 					<?php _e('child') ?></label>
!             						<label for="label41">
!             					<input class="valinp" type="radio" name="family" value="kin" id="label41" />
! 					<?php _e('kin') ?></label>
!                 					<label for="label42">
!                 					<input class="valinp" type="radio" name="family" value="parent" id="label42" />
! 					<?php _e('parent') ?></label>
!                 					<label for="label43">
!                 					<input class="valinp" type="radio" name="family" value="sibling" id="label43" />
! 					<?php _e('sibling') ?></label>
!                 					<label for="label44">
!                 					<input class="valinp" type="radio" name="family" value="spouse" id="label44" />
! 					<?php _e('spouse') ?></label>
!                 					<label for="label45">
!                 					<input class="valinp" type="radio" name="family" value="" id="label45" />
! 					<?php _e('none') ?></label>
!             					</td>
!            				</tr>
!             			<tr>
!             				<th scope="row"> <?php _e('romantic') ?> </th>
!             				<td><label for="label50">
!             					<input class="valinp" type="checkbox" name="romantic" value="muse" id="label50" />
! 					<?php _e('muse') ?></label>
!                 					<label for="label51">
!                 					<input class="valinp" type="checkbox" name="romantic" value="crush" id="label51" />
! 					<?php _e('crush') ?></label>
!                 					<label for="label52">
!                 					<input class="valinp" type="checkbox" name="romantic" value="date" id="label42" />
! 					<?php _e('date') ?></label>
!                 					<label for="label53">
!                 					<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="label53" />
! 					<?php _e('sweetheart') ?></label>
!             					</td>
!            				</tr>
!             			<tr>
!             				<th scope="row"> <?php _e('identity') ?> </th>
!             				<td><label for="label60">
!             					<input class="valinp" type="checkbox" name="identity" value="me" id="label60" />
! 					<?php _e('me') ?></label>
!             					</td>
!            				</tr>
!             			</table></td>
             	</tr>
  </table>
--- 99,205 ----
          <table class="editform" width="100%" cellspacing="2" cellpadding="5">
              <tr>
!                 <th width="33%" scope="row"><?php _e('rel:') ?></th>
!             	<td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td>
             	</tr>
              <tr>
!                 <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
!             	<td>
! 					<table cellpadding="3" cellspacing="5">
! 	          <tr>
!               <th scope="row"> <?php _e('identity') ?> </th>
!               <td>
!                 <label for="me">
!                 <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
!           <?php _e('another web address of mine') ?></label>
!               </td>
!             </tr>
!             <tr>
!               <th scope="row"> <?php _e('friendship') ?> </th>
!               <td>
!                 <label for="acquaintance">
!                 <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
!                 <label for="contact">
!                 <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
!                 <label id="friend">
!                 <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
!                 <label for="friendship">
!                 <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
!               </td>
!             </tr>
!             <tr>
!               <th scope="row"> <?php _e('physical') ?> </th>
!               <td>
!                 <label for="met">
!                 <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
!           <?php _e('met') ?></label>
!               </td>
!             </tr>
!             <tr>
!               <th scope="row"> <?php _e('professional') ?> </th>
!               <td>
!                 <label for="co-worker">
!                 <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
!           <?php _e('co-worker') ?></label>
!                 <label for="colleague">
!                 <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
!           <?php _e('colleague') ?></label>
!               </td>
!             </tr>
!             <tr>
!               <th scope="row"> <?php _e('geographical') ?> </th>
!               <td>
!                 <label for="co-resident">
!                 <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
!           <?php _e('co-resident') ?></label>
!                 <label for="neighbor">
!                 <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
!           <?php _e('neighbor') ?></label>
!                 <label for="geographical">
!                 <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
!           <?php _e('none') ?></label>
!               </td>
!             </tr>
!             <tr>
!               <th scope="row"> family </th>
!               <td>
!                 <label for="child">
!                 <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
!           <?php _e('child') ?></label>
!                 <label for="kin">
!                 <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
!           <?php _e('kin') ?></label>
!                 <label for="parent">
!                 <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
!           <?php _e('parent') ?></label>
!                 <label for="sibling">
!                 <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
!           <?php _e('sibling') ?></label>
!                 <label for="spouse">
!                 <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
!           <?php _e('spouse') ?></label>
!                 <label for="family">
!                 <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
!           <?php _e('none') ?></label>
!               </td>
!             </tr>
!             <tr>
!               <th scope="row"> <?php _e('romantic') ?> </th>
!               <td>
!                 <label for="muse">
!                 <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
!          <?php _e('muse') ?></label>
!                 <label for="crush">
!                 <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
!          <?php _e('crush') ?></label>
!                 <label for="date">
!                 <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
!          <?php _e('date') ?></label>
!                 <label for="romantic">
!                 <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
!          <?php _e('sweetheart') ?></label>
!               </td>
!             </tr>
!         </table>
! 		  </td>
             	</tr>
  </table>

From saxmatt at users.sourceforge.net  Thu Jan  6 09:52:14 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 09:52:20 2005
Subject: [wp-cvs] wordpress/wp-admin wp-admin.css,1.81,1.82
Message-ID: <E1CmUJS-0005oc-VP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22350/wp-admin

Modified Files:
	wp-admin.css 
Log Message:
Don't show link border on footer images.

Index: wp-admin.css
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/wp-admin.css,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** wp-admin.css	21 Dec 2004 22:09:07 -0000	1.81
--- wp-admin.css	6 Jan 2005 09:52:11 -0000	1.82
***************
*** 92,96 ****
  }
  
! img {
  	border: 0;
  }
--- 92,96 ----
  }
  
! img, #footer a {
  	border: 0;
  }

From saxmatt at users.sourceforge.net  Thu Jan  6 09:53:42 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 09:53:46 2005
Subject: [wp-cvs] wordpress/wp-includes class-snoopy.php,1.2,1.3
Message-ID: <E1CmUKt-0005sk-0c@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22599/wp-includes

Modified Files:
	class-snoopy.php 
Log Message:
Bad link in snoopy class.

Index: class-snoopy.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/class-snoopy.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class-snoopy.php	1 Jan 2005 22:09:07 -0000	1.2
--- class-snoopy.php	6 Jan 2005 09:53:40 -0000	1.3
***************
*** 32,36 ****
  
  The latest version of Snoopy can be obtained from:
! http://snoopy.sourceforge.com
  
  *************************************************/
--- 32,36 ----
  
  The latest version of Snoopy can be obtained from:
! http://snoopy.sourceforge.net
  
  *************************************************/

From saxmatt at users.sourceforge.net  Thu Jan  6 09:58:26 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 09:58:32 2005
Subject: [wp-cvs] wordpress/wp-includes comment-functions.php,1.9,1.10
Message-ID: <E1CmUPT-00063u-1G@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23293/wp-includes

Modified Files:
	comment-functions.php 
Log Message:
Proper linebreak in moderation email.

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** comment-functions.php	2 Jan 2005 02:50:03 -0000	1.9
--- comment-functions.php	6 Jan 2005 09:58:23 -0000	1.10
***************
*** 731,735 ****
      $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
  
!     $notify_message  = "A new comment on the post #$comment->comment_post_ID \"".$post->post_title."\" is waiting for your approval\n";
  	$notify_message .= get_permalink($comment->comment_post_ID);
      $notify_message .= "\n\nAuthor : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
--- 731,735 ----
      $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
  
!     $notify_message  = "A new comment on the post #$post->ID \"$post->post_title\" is waiting for your approval\r\n";
  	$notify_message .= get_permalink($comment->comment_post_ID);
      $notify_message .= "\n\nAuthor : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";

From saxmatt at users.sourceforge.net  Thu Jan  6 10:07:54 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 10:07:58 2005
Subject: [wp-cvs] wordpress/wp-includes functions.php,1.233,1.234
Message-ID: <E1CmUYd-0006bi-3i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25380/wp-includes

Modified Files:
	functions.php 
Log Message:
Don't cache serialized options.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.233
retrieving revision 1.234
diff -C2 -d -r1.233 -r1.234
*** functions.php	2 Jan 2005 02:47:45 -0000	1.233
--- functions.php	6 Jan 2005 10:07:52 -0000	1.234
***************
*** 391,394 ****
--- 391,395 ----
  function add_option($name, $value = '', $description = '', $autoload = 'yes') {
  	global $wpdb;
+ 	$original = $value;
  	if ( is_array($value) || is_object($value) )
  		$value = serialize($value);
***************
*** 402,406 ****
  		if($wpdb->insert_id) {
  			global $cache_settings;
! 			$cache_settings->{$name} = $value;
  		}
  	}
--- 403,407 ----
  		if($wpdb->insert_id) {
  			global $cache_settings;
! 			$cache_settings->{$name} = $original;
  		}
  	}

From saxmatt at users.sourceforge.net  Thu Jan  6 10:10:58 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 10:11:02 2005
Subject: [wp-cvs] wordpress/wp-includes functions-formatting.php,1.59,1.60
Message-ID: <E1CmUba-0006n8-Ee@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26101/wp-includes

Modified Files:
	functions-formatting.php 
Log Message:
Don't muddy <pre> pool

Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** functions-formatting.php	2 Jan 2005 09:08:55 -0000	1.59
--- functions-formatting.php	6 Jan 2005 10:10:55 -0000	1.60
***************
*** 53,56 ****
--- 53,58 ----
  function clean_pre($text) {
  	$text = str_replace('<br />', '', $text);
+ 	$text = str_replace('<p>', "\n", $text);
+ 	$text = str_replace('</p>', '', $text);
  	return $text;
  }

From saxmatt at users.sourceforge.net  Thu Jan  6 10:24:13 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 10:24:22 2005
Subject: [wp-cvs] wordpress/wp-includes functions-formatting.php,1.60,1.61
Message-ID: <E1CmUoQ-0007Xu-9h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28994/wp-includes

Modified Files:
	functions-formatting.php 
Log Message:
Patch for balanceTags from Scott Reilly: http://mosquito.wordpress.org/view.php?id=53

Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** functions-formatting.php	6 Jan 2005 10:10:55 -0000	1.60
--- functions-formatting.php	6 Jan 2005 10:24:11 -0000	1.61
***************
*** 316,319 ****
--- 316,320 ----
   @notes           
   @changelog       
+  ---  Modified by Scott Reilly (coffee2code) 02 Aug 2004
               1.2  ***TODO*** Make better - change loop condition to $text
               1.1  Fixed handling of append/stack pop order of end text
***************
*** 335,342 ****
  
  	while (preg_match("/<(\/?\w*)\s*([^>]*)>/",$text,$regex)) {
! 		$newtext = $newtext . $tagqueue;
  
  		$i = strpos($text,$regex[0]);
! 		$l = strlen($tagqueue) + strlen($regex[0]);
  
  		// clear the shifter
--- 336,343 ----
  
  	while (preg_match("/<(\/?\w*)\s*([^>]*)>/",$text,$regex)) {
! 		$newtext .= $tagqueue;
  
  		$i = strpos($text,$regex[0]);
! 		$l = strlen($regex[0]);
  
  		// clear the shifter
***************
*** 374,384 ****
  			// Tag Cleaning
  
! 			// Push if not img or br or hr
! 			if($tag != 'br' && $tag != 'img' && $tag != 'hr') {
  				$stacksize = array_push ($tagstack, $tag);
  			}
  
  			// Attributes
- 			// $attributes = $regex[2];
  			$attributes = $regex[2];
  			if($attributes) {
--- 375,394 ----
  			// Tag Cleaning
  
! 			// If self-closing or '', don't do anything.
! 			if((substr($regex[2],-1) == '/') || ($tag == '')) {
! 			}
! 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
! 			elseif ($tag == 'br' || $tag == 'img' || $tag == 'hr' || $tag == 'input') {
! 				$regex[2] .= '/';
! 			} else {	// Push the tag onto the stack
! 				// If the top of the stack is the same as the tag we want to push, close previous tag
! 				if (($stacksize > 0) && ($tag != 'div') && ($tagstack[$stacksize - 1] == $tag)) {
! 					$tagqueue = '</' . array_pop ($tagstack) . '>';
! 					$stacksize--;
! 				}
  				$stacksize = array_push ($tagstack, $tag);
  			}
  
  			// Attributes
  			$attributes = $regex[2];
  			if($attributes) {
***************
*** 386,389 ****
--- 396,404 ----
  			}
  			$tag = '<'.$tag.$attributes.'>';
+ 			//If already queuing a close tag, then put this tag on, too
+ 			if ($tagqueue) {
+ 				$tagqueue .= $tag;
+ 				$tag = '';
+ 			}
  		}
  		$newtext .= substr($text,0,$i) . $tag;
***************
*** 392,396 ****
  
  	// Clear Tag Queue
! 	$newtext = $newtext . $tagqueue;
  
  	// Add Remaining text
--- 407,411 ----
  
  	// Clear Tag Queue
! 	$newtext .= $tagqueue;
  
  	// Add Remaining text
***************
*** 399,403 ****
  	// Empty Stack
  	while($x = array_pop($tagstack)) {
! 		$newtext = $newtext . '</' . $x . '>'; // Add remaining tags to close      
  	}
  
--- 414,418 ----
  	// Empty Stack
  	while($x = array_pop($tagstack)) {
! 		$newtext .= '</' . $x . '>'; // Add remaining tags to close
  	}
  

From saxmatt at users.sourceforge.net  Thu Jan  6 17:40:22 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 17:40:28 2005
Subject: [wp-cvs] wordpress xmlrpc.php,1.36,1.37
Message-ID: <E1CmbcU-0006k7-F9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25907

Modified Files:
	xmlrpc.php 
Log Message:
We weren' processing pingbacks right. http://mosquito.wordpress.org/view.php?id=630

Index: xmlrpc.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/xmlrpc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** xmlrpc.php	24 Dec 2004 01:34:47 -0000	1.36
--- xmlrpc.php	6 Jan 2005 17:40:19 -0000	1.37
***************
*** 1220,1228 ****
  		$original_title = $title;
  
- 		$pingstatus = $wpdb->get_var("SELECT ping_status FROM $wpdb->posts WHERE ID = $tb_id");
- 	
- 		if ('open' != $pingstatus)
- 			trackback_response(1, 'Sorry, trackbacks are closed for this item.');
- 
  		$comment_post_ID = $post_ID;
  		$comment_author = $title;
--- 1220,1223 ----
***************
*** 1231,1234 ****
--- 1226,1234 ----
  		$comment_type = 'pingback';
  
+ 		$pingstatus = $wpdb->get_var("SELECT ping_status FROM $wpdb->posts WHERE ID = $post_ID");
+ 	
+ 		if ('open' != $pingstatus)
+ 			die('Sorry, pingbacks are closed for this item.');
+ 
  		$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_content', 'comment_type');
  

From saxmatt at users.sourceforge.net  Thu Jan  6 22:51:46 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 22:51:50 2005
Subject: [wp-cvs] wordpress/wp-admin post.php,1.117,1.118
Message-ID: <E1CmgTq-0001qw-GH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7091/wp-admin

Modified Files:
	post.php 
Log Message:
Cleaning up filters and format-to-post

Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** post.php	6 Jan 2005 09:29:04 -0000	1.117
--- post.php	6 Jan 2005 22:51:42 -0000	1.118
***************
*** 31,37 ****
  	$post_pingback = intval($_POST['post_pingback']);
  	$content = apply_filters('content_save_pre', $_POST['content']);
- 	$content = format_to_post($content);
  	$excerpt = apply_filters('excerpt_save_pre',$_POST['excerpt']);
- 	$excerpt = format_to_post($excerpt);
  	$post_title = $_POST['post_title'];
  	$post_categories = $_POST['post_category'];
--- 31,35 ----
***************
*** 237,243 ****
  	if (!$post_categories) $post_categories[] = 1;
  	$content = apply_filters('content_save_pre', $_POST['content']);
- 	$content = format_to_post($content);
  	$excerpt = apply_filters('excerpt_save_pre', $_POST['excerpt']);
- 	$excerpt = format_to_post($excerpt);
  	$post_title = $_POST['post_title'];
  	$prev_status = $_POST['prev_status'];
--- 235,239 ----
***************
*** 608,612 ****
  	}
  	$content = apply_filters('comment_save_pre', $_POST['content']);
- 	$content = format_to_post($content);
  
  	$result = $wpdb->query("
--- 604,607 ----

From saxmatt at users.sourceforge.net  Thu Jan  6 22:51:46 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 22:51:51 2005
Subject: [wp-cvs] wordpress/wp-includes vars.php,1.41,1.42
Message-ID: <E1CmgTq-0001r6-T8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7091/wp-includes

Modified Files:
	vars.php 
Log Message:
Cleaning up filters and format-to-post

Index: vars.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/vars.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** vars.php	24 Dec 2004 01:34:47 -0000	1.41
--- vars.php	6 Jan 2005 22:51:44 -0000	1.42
***************
*** 140,144 ****
  
  add_filter('pre_comment_content', 'wp_filter_kses');
- add_filter('pre_comment_content', 'format_to_post');
  add_filter('pre_comment_content', 'balanceTags', 30);
  
--- 140,143 ----

From saxmatt at users.sourceforge.net  Thu Jan  6 22:51:47 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 22:53:31 2005
Subject: [wp-cvs] wordpress xmlrpc.php,1.37,1.38
Message-ID: <E1CmgTr-0001rI-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7091

Modified Files:
	xmlrpc.php 
Log Message:
Cleaning up filters and format-to-post

Index: xmlrpc.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/xmlrpc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** xmlrpc.php	6 Jan 2005 17:40:19 -0000	1.37
--- xmlrpc.php	6 Jan 2005 22:51:44 -0000	1.38
***************
*** 358,362 ****
  
  	  $content = xmlrpc_removepostdata($content);
! 	  $post_content = format_to_post($content);
  
  	  $post_date = current_time('mysql');
--- 358,362 ----
  
  	  $content = xmlrpc_removepostdata($content);
! 	  $post_content = apply_filters( 'content_save_pre', $content );
  
  	  $post_date = current_time('mysql');
***************
*** 412,416 ****
  
  	  $content = xmlrpc_removepostdata($content);
! 	  $post_content = format_to_post($content);
  
  	  $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
--- 412,416 ----
  
  	  $content = xmlrpc_removepostdata($content);
! 	  $post_content = apply_filters( 'content_save_pre', $content );
  
  	  $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
***************
*** 490,494 ****
  
  	  $post_title = $content_struct['title'];
! 	  $post_content = format_to_post($content_struct['description']);
  	  $post_status = $publish ? 'publish' : 'draft';
  
--- 490,494 ----
  
  	  $post_title = $content_struct['title'];
! 	  $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
  	  $post_status = $publish ? 'publish' : 'draft';
  
***************
*** 573,577 ****
  
  	  $post_title = $content_struct['title'];
! 	  $post_content = format_to_post($content_struct['description']);
  	  $catnames = $content_struct['categories'];
  		
--- 573,577 ----
  
  	  $post_title = $content_struct['title'];
! 	  $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
  	  $catnames = $content_struct['categories'];
  		

From saxmatt at users.sourceforge.net  Thu Jan  6 23:28:54 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Thu Jan  6 23:29:08 2005
Subject: [wp-cvs] wordpress xmlrpc.php,1.39,1.40
Message-ID: <E1Cmh3v-0004bk-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17699

Modified Files:
	xmlrpc.php 
Log Message:
Allow plugins to hook into XML-RPC server.

Index: xmlrpc.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/xmlrpc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** xmlrpc.php	6 Jan 2005 23:10:28 -0000	1.39
--- xmlrpc.php	6 Jan 2005 23:28:51 -0000	1.40
***************
*** 106,109 ****
--- 106,110 ----
  		  'demo.addTwoNumbers' => 'this:addTwoNumbers'
  		);
+ 		$this->methods = apply_filters('xmlrpc_methods', $this->methods);
  		$this->IXR_Server($this->methods);
  	}

From saxmatt at users.sourceforge.net  Fri Jan  7 01:11:53 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:12:13 2005
Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.23,1.24
Message-ID: <E1Cmifh-0003Ld-4F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12831/wp-includes

Modified Files:
	functions-post.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=521

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** functions-post.php	5 Jan 2005 21:11:42 -0000	1.23
--- functions-post.php	7 Jan 2005 01:11:51 -0000	1.24
***************
*** 243,275 ****
  
  // Get author's preferred display name
! function get_author_name($auth_id) {
! 	$authordata = get_userdata($auth_id);
! 
! 	switch($authordata["user_idmode"]) {
! 		case "nickname":
! 			$authorname = $authordata["user_nickname"];
  
! 		case "login":
! 			$authorname = $authordata["user_login"];
  			break;
! 	
! 		case "firstname":
! 			$authorname = $authordata["user_firstname"];
  			break;
! 
! 		case "lastname":
! 			$authorname = $authordata["user_lastname"];
  			break;
! 
! 		case "namefl":
! 			$authorname = $authordata["user_firstname"]." ".$authordata["user_lastname"];
  			break;
! 
! 		case "namelf":
! 			$authorname = $authordata["user_lastname"]." ".$authordata["user_firstname"];
  			break;
- 
  		default:
! 			$authorname = $authordata["user_nickname"];
  			break;
  	}
--- 243,270 ----
  
  // Get author's preferred display name
! function get_author_name( $auth_id ) {
! 	$authordata = get_userdata( $auth_id );
  
! 	switch( $authordata['user_idmode'] ) {
! 		case 'nickname':
! 			$authorname = $authordata['user_nickname'];
  			break;
! 		case 'login':
! 			$authorname = $authordata['user_login'];
  			break;
! 		case 'firstname':
! 			$authorname = $authordata['user_firstname'];
  			break;
! 		case 'lastname':
! 			$authorname = $authordata['user_lastname'];
  			break;
! 		case 'namefl':
! 			$authorname = $authordata['user_firstname'].' '.$authordata['user_lastname'];
! 			break;
! 		case 'namelf':
! 			$authorname = $authordata['user_lastname'].' '.$authordata['user_firstname'];
  			break;
  		default:
! 			$authorname = $authordata['user_nickname'];
  			break;
  	}
***************
*** 280,284 ****
  // get extended entry info (<!--more-->)
  function get_extended($post) {
! 	list($main,$extended) = explode('<!--more-->',$post);
  
  	// Strip leading and trailing whitespace
--- 275,279 ----
  // get extended entry info (<!--more-->)
  function get_extended($post) {
! 	list($main,$extended) = explode('<!--more-->', $post, 2);
  
  	// Strip leading and trailing whitespace

From saxmatt at users.sourceforge.net  Fri Jan  7 01:11:53 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:12:13 2005
Subject: [wp-cvs] wordpress/wp-admin edit-form-advanced.php, 1.48,
	1.49 post.php, 1.118, 1.119
Message-ID: <E1Cmifh-0003Lb-QG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12831/wp-admin

Modified Files:
	edit-form-advanced.php post.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=521

Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** post.php	6 Jan 2005 22:51:42 -0000	1.118
--- post.php	7 Jan 2005 01:11:49 -0000	1.119
***************
*** 240,244 ****
  	$post_status = $_POST['post_status'];
  	$menu_order = (int) $_POST['menu_order'];
! 	if (! empty($_POST['post_author'])) {
  		$post_author = (int) $_POST['post_author'];
  	} else {
--- 240,246 ----
  	$post_status = $_POST['post_status'];
  	$menu_order = (int) $_POST['menu_order'];
! 	if (! empty($_POST['post_author_override'])) {
! 		$post_author = (int) $_POST['post_author_override'];
! 	} else if (! empty($_POST['post_author'])) {
  		$post_author = (int) $_POST['post_author'];
  	} else {

Index: edit-form-advanced.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-form-advanced.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** edit-form-advanced.php	19 Dec 2004 00:26:32 -0000	1.48
--- edit-form-advanced.php	7 Jan 2005 01:11:49 -0000	1.49
***************
*** 45,49 ****
  
  <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
! <input type="hidden" name="action" value='<?php echo $form_action ?>' />
  <?php echo $form_extra ?>
  <?php if (isset($_GET['message']) && 2 > $_GET['message']) : ?>
--- 45,51 ----
  
  <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
! <input type="hidden" name="action" value="<?php echo $form_action ?>" />
! <input type="hidden" name="post_author" value="<?php echo $post_author ?>" />
! 
  <?php echo $form_extra ?>
  <?php if (isset($_GET['message']) && 2 > $_GET['message']) : ?>
***************
*** 153,157 ****
  		<th scope="row"><?php _e('Post author'); ?>:</th>
  		<td>
! 		<select name="post_author" id="post_author">
  		<?php 
  		foreach ($users as $o) :
--- 155,159 ----
  		<th scope="row"><?php _e('Post author'); ?>:</th>
  		<td>
! 		<select name="post_author_override" id="post_author_override">
  		<?php 
  		foreach ($users as $o) :

From saxmatt at users.sourceforge.net  Fri Jan  7 01:17:44 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:17:49 2005
Subject: [wp-cvs] wordpress wp-links-opml.php,1.9,1.10
Message-ID: <E1Cmil6-0003mf-Rr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14538

Modified Files:
	wp-links-opml.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=624

Index: wp-links-opml.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-links-opml.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wp-links-opml.php	12 Dec 2004 20:41:16 -0000	1.9
--- wp-links-opml.php	7 Jan 2005 01:17:42 -0000	1.10
***************
*** 49,53 ****
          } // end if new category
  ?>
!             <outline title="<?php echo wp_specialchars($result->link_name); ?>" type="link" xmlUrl="<?php echo $result->link_rss; ?>" htmlUrl="<?php echo($result->link_url) ?>"/>
  <?php
          } // end foreach
--- 49,53 ----
          } // end if new category
  ?>
!             <outline title="<?php echo wp_specialchars($result->link_name); ?>" type="link" xmlUrl="<?php echo $result->link_rss; ?>" htmlUrl="<?php echo(wp_specialchars($result->link_url)) ?>"/>
  <?php
          } // end foreach

From saxmatt at users.sourceforge.net  Fri Jan  7 01:21:14 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:21:19 2005
Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.24,1.25
Message-ID: <E1CmioV-00040j-JB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15413/wp-includes

Modified Files:
	functions-post.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=608

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** functions-post.php	7 Jan 2005 01:11:51 -0000	1.24
--- functions-post.php	7 Jan 2005 01:21:12 -0000	1.25
***************
*** 88,103 ****
  
  	// First get all of the original fields
! 	extract(wp_get_single_post($postarr['ID'],ARRAY_A));	
  
  	// Now overwrite any changed values being passed in
  	extract($postarr);
! 	
  	// Make sure we set a valid category
! 	if (0 == count($post_category) || !is_array($post_category)) {
  		$post_category = array($post_default_category);
- 	}
  
  	// Do some escapes for safety
! 	$post_title = $wpdb->escape($post_title);
  	$post_excerpt = $wpdb->escape($post_excerpt);
  	$post_content = $wpdb->escape($post_content);
--- 88,102 ----
  
  	// First get all of the original fields
! 	extract(wp_get_single_post($postarr['ID'], ARRAY_A));	
  
  	// Now overwrite any changed values being passed in
  	extract($postarr);
! 
  	// Make sure we set a valid category
! 	if ( 0 == count($post_category) || !is_array($post_category) )
  		$post_category = array($post_default_category);
  
  	// Do some escapes for safety
! 	$post_title   = $wpdb->escape($post_title);
  	$post_excerpt = $wpdb->escape($post_excerpt);
  	$post_content = $wpdb->escape($post_content);
***************
*** 122,127 ****
  	$result = $wpdb->query($sql);
  
! 	wp_set_post_cats('',$ID,$post_category);
! 	
  	return $wpdb->rows_affected;
  }
--- 121,128 ----
  	$result = $wpdb->query($sql);
  
! 	wp_set_post_cats('', $ID, $post_category);
! 
! 	do_action('edit_post', $ID);
! 
  	return $wpdb->rows_affected;
  }

From saxmatt at users.sourceforge.net  Fri Jan  7 01:24:35 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:24:41 2005
Subject: [wp-cvs] wordpress/wp-content/plugins staticize-reloaded.php, 1.6,
	1.7
Message-ID: <E1Cmirj-0004DH-Tx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-content/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16189/wp-content/plugins

Modified Files:
	staticize-reloaded.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=517

Index: staticize-reloaded.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/plugins/staticize-reloaded.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** staticize-reloaded.php	25 Nov 2004 19:12:37 -0000	1.6
--- staticize-reloaded.php	7 Jan 2005 01:24:33 -0000	1.7
***************
*** 34,40 ****
  
  	$key = $_SERVER['REQUEST_URI'] . join($_COOKIE, ',');
! 	$script = basename($_SERVER['SCRIPT_NAME']);
  
! 	if( strstr($_SERVER['SCRIPT_NAME'], 'wp-') && !in_array($script, $acceptableFiles) ) 
  		return;
  
--- 34,40 ----
  
  	$key = $_SERVER['REQUEST_URI'] . join($_COOKIE, ',');
! 	$script = basename($_SERVER['PHP_SELF']);
  
! 	if( strstr($_SERVER['PHP_SELF'], 'wp-') && !in_array($script, $acceptableFiles) ) 
  		return;
  

From saxmatt at users.sourceforge.net  Fri Jan  7 01:29:52 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:29:56 2005
Subject: [wp-cvs] wordpress/wp-includes class-pop3.php,1.1,1.2
Message-ID: <E1Cmiwq-0004Wq-Fl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17399/wp-includes

Modified Files:
	class-pop3.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=252

Index: class-pop3.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/class-pop3.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class-pop3.php	11 Dec 2003 00:22:36 -0000	1.1
--- class-pop3.php	7 Jan 2005 01:29:49 -0000	1.2
***************
*** 656,661 ****
          for($count =0; $count < $length; $count++)
          {
!             $digit = substr($server_text,$count,1);
!             if(!empty($digit))             {
                  if( (!$outside) && ($digit != '<') && ($digit != '>') )
                  {
--- 656,661 ----
          for($count =0; $count < $length; $count++)
          {
!             $digit = substr($server_text, $count, 1);
!             if ( false !== $digit ) {
                  if( (!$outside) && ($digit != '<') && ($digit != '>') )
                  {

From saxmatt at users.sourceforge.net  Fri Jan  7 01:39:21 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 01:39:26 2005
Subject: [wp-cvs] wordpress/wp-admin options.php,1.38,1.39
Message-ID: <E1Cmj61-00053y-G9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19454/wp-admin

Modified Files:
	options.php 
Log Message:
Trim updated options.

Index: options.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** options.php	12 Dec 2004 20:41:14 -0000	1.38
--- options.php	7 Jan 2005 01:39:18 -0000	1.39
***************
*** 49,53 ****
              if ($user_level >= $option->option_admin_level) {
                  $old_val = $option->option_value;
!                 $new_val = wp_specialchars($_POST[$option->option_name]);
                  if (!$new_val) {
                      if (3 == $option->option_type)
--- 49,53 ----
              if ($user_level >= $option->option_admin_level) {
                  $old_val = $option->option_value;
!                 $new_val = wp_specialchars( trim($_POST[$option->option_name]) );
                  if (!$new_val) {
                      if (3 == $option->option_type)

From saxmatt at users.sourceforge.net  Fri Jan  7 22:02:01 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 22:02:08 2005
Subject: [wp-cvs] wordpress wp-atom.php, 1.15, 1.16 wp-rdf.php, 1.21,
	1.22 wp-rss.php, 1.21, 1.22 wp-rss2.php, 1.30, 1.31
Message-ID: <E1Cn2BI-0006dM-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25435

Modified Files:
	wp-atom.php wp-rdf.php wp-rss.php wp-rss2.php 
Log Message:
Some feed template function cleanup.

Index: wp-rss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss2.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wp-rss2.php	4 Jan 2005 23:30:09 -0000	1.30
--- wp-rss2.php	7 Jan 2005 22:01:58 -0000	1.31
***************
*** 13,17 ****
  <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
  
! <!-- generator="wordpress/<?php echo $wp_version ?>" -->
  <rss version="2.0" 
  	xmlns:content="http://purl.org/rss/1.0/modules/content/"
--- 13,17 ----
  <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
  
! <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" -->
  <rss version="2.0" 
  	xmlns:content="http://purl.org/rss/1.0/modules/content/"
***************
*** 20,29 ****
  
  <channel>
! 	<title><?php bloginfo_rss('name') ?></title>
  	<link><?php bloginfo_rss('url') ?></link>
  	<description><?php bloginfo_rss("description") ?></description>
- 	<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate()); ?></copyright>
  	<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></pubDate>
! 	<generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator>
  
  	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
--- 20,28 ----
  
  <channel>
! 	<title><?php bloginfo_rss('name'); ?></title>
  	<link><?php bloginfo_rss('url') ?></link>
  	<description><?php bloginfo_rss("description") ?></description>
  	<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></pubDate>
! 	<generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
  
  	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
***************
*** 32,66 ****
  		<link><?php permalink_single_rss() ?></link>
  		<comments><?php comments_link(); ?></comments>
! 		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', $post->post_date_gmt, 0); ?></pubDate>
  		<?php the_category_rss() ?>
  		<guid><?php the_permalink($id); ?></guid>
  <?php if (get_settings('rss_use_excerpt')) : ?>
! 		<description><?php the_excerpt_rss('', 2) ?></description>
  <?php else : ?>
! 		<description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
! 	<?php if ( strlen( $post->post_content ) ) : ?>
  		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
- 	<?php else : ?>
- 		<content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
- 	<?php endif; ?>
  <?php endif; ?>
  		<wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
! <?php 
! $custom_fields = get_post_custom();
! if( is_array( $custom_fields ) ) {
!     while( list( $key, $val ) = each( $custom_fields ) ) { 
!         if( $key == 'enclosure' ) {
! 			if (is_array($val)) {
! 				foreach($val as $enc) {
! 		            $enclosure = split( "\n", $enc );
! 		            print "<enclosure url='".trim( $enclosure[ 0 ] )."' length='".trim( $enclosure[ 1 ] )."' type='".trim( $enclosure[ 2 ] )."'/>\n";
! 	            }
!             }
!         }
!     }
! }
! ?>
  	</item>
  	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
  </channel>
! </rss>
--- 31,48 ----
  		<link><?php permalink_single_rss() ?></link>
  		<comments><?php comments_link(); ?></comments>
! 		<pubDate><?php the_time('D, d M Y H:i:s +0000'); ?></pubDate>
  		<?php the_category_rss() ?>
+ 
  		<guid><?php the_permalink($id); ?></guid>
  <?php if (get_settings('rss_use_excerpt')) : ?>
! 		<description><?php the_excerpt_rss() ?></description>
  <?php else : ?>
! 		<description><?php the_excerpt_rss() ?></description>
  		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
  <?php endif; ?>
  		<wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
! <?php rss_enclosure(); ?>
  	</item>
  	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
  </channel>
! </rss>
\ No newline at end of file

Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wp-atom.php	4 Jan 2005 23:30:09 -0000	1.15
--- wp-atom.php	7 Jan 2005 22:01:58 -0000	1.16
***************
*** 16,24 ****
    xmlns:dc="http://purl.org/dc/elements/1.1/">
  	<title><?php bloginfo_rss('name') ?></title>
! 	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
  	<tagline><?php bloginfo_rss("description") ?></tagline>
  	<modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></modified>
  	<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></copyright>
! 	<generator url="http://wordpress.org/" version="<?php echo $wp_version ?>">WordPress</generator>
  	
  	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
--- 16,24 ----
    xmlns:dc="http://purl.org/dc/elements/1.1/">
  	<title><?php bloginfo_rss('name') ?></title>
! 	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
  	<tagline><?php bloginfo_rss("description") ?></tagline>
  	<modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></modified>
  	<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></copyright>
! 	<generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
  	
  	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
***************
*** 29,37 ****
  		<title><?php the_title_rss() ?></title>
  		<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
! 		<id><?php bloginfo_rss("url") ?>?p=<?php echo $id; ?></id>
! 		<modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_modified_gmt); ?></modified>
! 		<issued><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt); ?></issued>
  		<?php the_category_rss('rdf') ?>
! 		<summary type="text/html" mode="escaped"><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></summary>
  <?php if (!get_settings('rss_use_excerpt')) : ?>
  	<?php if ( strlen( $post->post_content ) ) : ?>
--- 29,37 ----
  		<title><?php the_title_rss() ?></title>
  		<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
! 		<id><?php the_guid(); ?></id>
! 		<modified><?php the_time('Y-m-d\TH:i:s\Z'); ?></modified>
! 		<issued>  <?php the_time('Y-m-d\TH:i:s\Z'); ?></issued>
  		<?php the_category_rss('rdf') ?>
! 		<summary type="text/html" mode="escaped"><?php the_excerpt_rss(); ?></summary>
  <?php if (!get_settings('rss_use_excerpt')) : ?>
  	<?php if ( strlen( $post->post_content ) ) : ?>
***************
*** 41,45 ****
  	<?php endif; ?>
  <?php else : ?>
! 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss('', 2) ?>]]></content>
  <?php endif; ?>
  	</entry>
--- 41,45 ----
  	<?php endif; ?>
  <?php else : ?>
! 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
  <?php endif; ?>
  	</entry>

Index: wp-rdf.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rdf.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wp-rdf.php	27 Nov 2004 00:42:55 -0000	1.21
--- wp-rdf.php	7 Jan 2005 22:01:58 -0000	1.22
***************
*** 47,51 ****
  	<?php the_category_rss('rdf') ?>
  <?php if (get_settings('rss_use_excerpt')) : ?>
! 	<description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
  <?php else : ?>
  	<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
--- 47,51 ----
  	<?php the_category_rss('rdf') ?>
  <?php if (get_settings('rss_use_excerpt')) : ?>
! 	<description><?php the_excerpt_rss() ?></description>
  <?php else : ?>
  	<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>

Index: wp-rss.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wp-rss.php	27 Nov 2004 00:42:55 -0000	1.21
--- wp-rss.php	7 Jan 2005 22:01:58 -0000	1.22
***************
*** 27,31 ****
  if (get_settings('rss_use_excerpt')) {
  ?>
!             <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
  <?php
  } else { // use content
--- 27,31 ----
  if (get_settings('rss_use_excerpt')) {
  ?>
!             <description><?php the_excerpt_rss() ?></description>
  <?php
  } else { // use content

From saxmatt at users.sourceforge.net  Fri Jan  7 22:02:02 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan  7 22:02:09 2005
Subject: [wp-cvs] wordpress/wp-includes feed-functions.php, NONE,
	1.1 comment-functions.php, 1.11,
	1.12 template-functions-author.php, 1.16,
	1.17 template-functions-category.php, 1.46,
	1.47 template-functions-general.php, 1.61,
	1.62 template-functions-links.php, 1.46,
	1.47 template-functions-post.php, 1.37,
	1.38 template-functions.php, 1.54, 1.55 vars.php, 1.42, 1.43
Message-ID: <E1Cn2BJ-0006dQ-O4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25435/wp-includes

Modified Files:
	comment-functions.php template-functions-author.php 
	template-functions-category.php template-functions-general.php 
	template-functions-links.php template-functions-post.php 
	template-functions.php vars.php 
Added Files:
	feed-functions.php 
Log Message:
Some feed template function cleanup.

--- NEW FILE: feed-functions.php ---
<?php

function bloginfo_rss($show='') {
    $info = strip_tags(get_bloginfo($show));
    echo convert_chars($info);
}

function the_title_rss() {
	$title = get_the_title();
	$title = apply_filters('the_title', $title);
	$title = apply_filters('the_title_rss', $title);
	echo $title;
}

function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
	$content = get_the_content($more_link_text, $stripteaser, $more_file);
	$content = apply_filters('the_content', $content);
	if ($cut && !$encode_html) {
		$encode_html = 2;
	}
	if ($encode_html == 1) {
		$content = wp_specialchars($content);
		$cut = 0;
	} elseif ($encode_html == 0) {
		$content = make_url_footnote($content);
	} elseif ($encode_html == 2) {
		$content = strip_tags($content);
	}
	if ($cut) {
		$blah = explode(' ', $content);
		if (count($blah) > $cut) {
			$k = $cut;
			$use_dotdotdot = 1;
		} else {
			$k = count($blah);
			$use_dotdotdot = 0;
		}
		for ($i=0; $i<$k; $i++) {
			$excerpt .= $blah[$i].' ';
		}
		$excerpt .= ($use_dotdotdot) ? '...' : '';
		$content = $excerpt;
	}
	$content = str_replace(']]>', ']]&gt;', $content);
	echo $content;
}

function the_excerpt_rss() {
	$output = get_the_excerpt(true);
	echo apply_filters('the_excerpt_rss', $output);
}

function permalink_single_rss($file = '') {
    echo get_permalink();
}

function comment_link_rss() {
	echo get_comments_link();
}

function comment_author_rss() {
	$author = apply_filters('comment_author_rss', get_comment_author() );
	echo $author;
}

function comment_text_rss() {
	$comment_text = get_comment_text();
	$comment_text = apply_filters('comment_text_rss', $comment_text);
	echo $comment_text;
}

function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'wp-commentsrss2.php') {
	$url = comments_rss($commentsrssfilename);
	echo "<a href='$url'>$link_text</a>";
}

function comments_rss($commentsrssfilename = 'wp-commentsrss2.php') {
	global $id;
	global $querystring_start, $querystring_equal, $querystring_separator;

	if ('' != get_settings('permalink_structure'))
		$url = trailingslashit( get_permalink() ) . 'feed/';
	else
		$url = get_settings('siteurl') . "/$commentsrssfilename?p=$id";

	return $url;
}

function get_author_rss_link($echo = false, $author_id, $author_nicename) {
       global $querystring_start, $querystring_equal;
       $auth_ID = $author_id;
       $permalink_structure = get_settings('permalink_structure');

       if ('' == $permalink_structure) {
           $file = get_settings('siteurl') . '/wp-rss2.php';
           $link = $file . $querystring_start . 'author' . $querystring_equal . $author_id;
       } else {
           $link = get_author_link(0, $author_id, $author_nicename);
           $link = $link . "feed/";
       }

       if ($echo) echo $link;
       return $link;
}

function get_category_rss_link($echo = false, $category_id, $category_nicename) {
       global $querystring_start, $querystring_equal;
       $cat_ID = $category_id;
       $permalink_structure = get_settings('permalink_structure');

       if ('' == $permalink_structure) {
               $file = get_settings('siteurl') . '/wp-rss2.php';
        $link = $file . $querystring_start . 'cat' . $querystring_equal . $category_id;
       } else {
        $link = get_category_link(0, $category_id, $category_nicename);
               $link = $link . "feed/";
       }

       if ($echo) echo $link;
       return $link;
}

function the_category_rss($type = 'rss') {
    $categories = get_the_category();
    $the_list = '';
    foreach ($categories as $category) {
        $category->cat_name = convert_chars($category->cat_name);
        if ('rdf' == $type) {
            $the_list .= "\n\t<dc:subject>$category->cat_name</dc:subject>";
        } else {
            $the_list .= "\n\t<category>$category->cat_name</category>";
        }
    }
    echo apply_filters('the_category_rss', $the_list);
}

function rss_enclosure() {
	global $id;
	$custom_fields = get_post_custom();
	if( is_array( $custom_fields ) ) {
		while( list( $key, $val ) = each( $custom_fields ) ) { 
			if( $key == 'enclosure' ) {
				if (is_array($val)) {
					foreach($val as $enc) {
						$enclosure = split( "\n", $enc );
						print "<enclosure url='".trim( $enclosure[ 0 ] )."' length='".trim( $enclosure[ 1 ] )."' type='".trim( $enclosure[ 2 ] )."'/>\n";
					}
				}
			}
		}
	}
}

?>
Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** template-functions-links.php	24 Dec 2004 01:34:47 -0000	1.46
--- template-functions-links.php	7 Jan 2005 22:01:59 -0000	1.47
***************
*** 23,30 ****
  }
  
- function permalink_single_rss($file = '') {
-     echo get_permalink();
- }
- 
  function get_permalink($id = false) {
  	global $post, $wpdb;
--- 23,26 ----

Index: template-functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-post.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** template-functions-post.php	4 Jan 2005 23:30:10 -0000	1.37
--- template-functions-post.php	7 Jan 2005 22:01:59 -0000	1.38
***************
*** 40,50 ****
  }
  
- function the_title_rss() {
- 	$title = get_the_title();
- 	$title = apply_filters('the_title', $title);
- 	$title = apply_filters('the_title_rss', $title);
- 	echo $title;
- }
- 
  function get_the_title($id = 0) {
  	global $post, $wpdb;
--- 40,43 ----
***************
*** 60,63 ****
--- 53,71 ----
  }
  
+ function get_the_guid( $id = 0 ) {
+ 	global $post, $wpdb;
+ 	$guid = $post->guid;
+ 
+ 	if ( 0 != $id )
+ 		$title = $wpdb->get_var("SELECT guid FROM $wpdb->posts WHERE ID = $id");
+ 	$guid = apply_filters('get_the_guid', $guid);
+ 	return $guid;
+ }
+ 
+ function the_guid( $id = 0 ) {
+ 	echo get_the_guid();
+ }
+ 
+ 
  function the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
      $content = get_the_content($more_link_text, $stripteaser, $more_file);
***************
*** 67,103 ****
  }
  
- function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
- 	$content = get_the_content($more_link_text, $stripteaser, $more_file);
- 	$content = apply_filters('the_content', $content);
- 	if ($cut && !$encode_html) {
- 		$encode_html = 2;
- 	}
- 	if ($encode_html == 1) {
- 		$content = wp_specialchars($content);
- 		$cut = 0;
- 	} elseif ($encode_html == 0) {
- 		$content = make_url_footnote($content);
- 	} elseif ($encode_html == 2) {
- 		$content = strip_tags($content);
- 	}
- 	if ($cut) {
- 		$blah = explode(' ', $content);
- 		if (count($blah) > $cut) {
- 			$k = $cut;
- 			$use_dotdotdot = 1;
- 		} else {
- 			$k = count($blah);
- 			$use_dotdotdot = 0;
- 		}
- 		for ($i=0; $i<$k; $i++) {
- 			$excerpt .= $blah[$i].' ';
- 		}
- 		$excerpt .= ($use_dotdotdot) ? '...' : '';
- 		$content = $excerpt;
- 	}
- 	$content = str_replace(']]>', ']]&gt;', $content);
- 	echo $content;
- }
- 
  function get_the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
      global $id, $post, $more, $single, $withcomments, $page, $pages, $multipage, $numpages;
--- 75,78 ----
***************
*** 143,182 ****
  }
  
- function the_excerpt_rss($cut = 0, $encode_html = FALSE) {
-     $output = get_the_excerpt(true);
- 
-     $output = convert_chars($output);
-     if ($cut && !$encode_html) {
-         $encode_html = 2;
-     }
-     if ($encode_html == 1) {
-         $output = wp_specialchars($output);
-         $cut = 0;
-     } elseif ($encode_html === 0) {
-         $output = make_url_footnote($output);
-     } elseif ($encode_html == 2) {
-         $output = strip_tags($output);
-         $output = str_replace('&', '&amp;', $output);
-     }
-     if ($cut) {
-         $excerpt = '';
-         $blah = explode(' ', $output);
-         if (count($blah) > $cut) {
-             $k = $cut;
-             $use_dotdotdot = 1;
-         } else {
-             $k = count($blah);
-             $use_dotdotdot = 0;
-         }
-         for ($i=0; $i<$k; $i++) {
-             $excerpt .= $blah[$i].' ';
-         }
-         $excerpt .= ($use_dotdotdot) ? '...' : '';
-         $output = $excerpt;
-     }
-     $output = str_replace(']]>', ']]&gt;', $output);
-     echo apply_filters('the_excerpt_rss', $output);
- }
- 
  function get_the_excerpt($fakeit = true) {
      global $id, $post;
--- 118,121 ----

Index: template-functions-category.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-category.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** template-functions-category.php	4 Jan 2005 23:29:13 -0000	1.46
--- template-functions-category.php	7 Jan 2005 22:01:59 -0000	1.47
***************
*** 44,64 ****
  }
  
- function get_category_rss_link($echo = false, $category_id, $category_nicename) {
-        global $querystring_start, $querystring_equal;
-        $cat_ID = $category_id;
-        $permalink_structure = get_settings('permalink_structure');
- 
-        if ('' == $permalink_structure) {
-                $file = get_settings('siteurl') . '/wp-rss2.php';
-         $link = $file . $querystring_start . 'cat' . $querystring_equal . $category_id;
-        } else {
-         $link = get_category_link(0, $category_id, $category_nicename);
-                $link = $link . "feed/";
-        }
- 
-        if ($echo) echo $link;
-        return $link;
- }
- 
  function the_category($separator = '', $parents='') {
      $categories = get_the_category();
--- 44,47 ----
***************
*** 119,136 ****
  }
  
- function the_category_rss($type = 'rss') {
-     $categories = get_the_category();
-     $the_list = '';
-     foreach ($categories as $category) {
-         $category->cat_name = convert_chars($category->cat_name);
-         if ('rdf' == $type) {
-             $the_list .= "\n\t<dc:subject>$category->cat_name</dc:subject>";
-         } else {
-             $the_list .= "\n\t<category>$category->cat_name</category>";
-         }
-     }
-     echo apply_filters('the_category_rss', $the_list);
- }
- 
  function get_the_category_by_ID($cat_ID) {
      global $cache_categories, $wpdb;
--- 102,105 ----

Index: template-functions-author.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-author.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** template-functions-author.php	24 Dec 2004 01:34:47 -0000	1.16
--- template-functions-author.php	7 Jan 2005 22:01:59 -0000	1.17
***************
*** 141,161 ****
  }
  
- function get_author_rss_link($echo = false, $author_id, $author_nicename) {
-        global $querystring_start, $querystring_equal;
-        $auth_ID = $author_id;
-        $permalink_structure = get_settings('permalink_structure');
- 
-        if ('' == $permalink_structure) {
-            $file = get_settings('siteurl') . '/wp-rss2.php';
-            $link = $file . $querystring_start . 'author' . $querystring_equal . $author_id;
-        } else {
-            $link = get_author_link(0, $author_id, $author_nicename);
-            $link = $link . "feed/";
-        }
- 
-        if ($echo) echo $link;
-        return $link;
- }
- 
  function wp_list_authors($args = '') {
  	parse_str($args, $r);
--- 141,144 ----

Index: vars.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/vars.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** vars.php	6 Jan 2005 22:51:44 -0000	1.42
--- vars.php	7 Jan 2005 22:01:59 -0000	1.43
***************
*** 159,162 ****
--- 159,163 ----
  
  add_filter('comment_excerpt', 'convert_chars');
+ add_filter('the_excerpt_rss', 'convert_chars');
  
  // Places to balance tags on input

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** comment-functions.php	6 Jan 2005 23:10:28 -0000	1.11
--- comment-functions.php	7 Jan 2005 22:01:58 -0000	1.12
***************
*** 61,68 ****
  }
  
- function comment_link_rss() {
- 	echo get_comments_link();
- }
- 
  function comments_popup_script($width=400, $height=400, $file='') {
      global $wpcommentspopupfile, $wptrackbackpopupfile, $wppingbackpopupfile, $wpcommentsjavascript;
--- 61,64 ----
***************
*** 146,154 ****
  }
  
- function comment_author_rss() {
- 	$author = apply_filters('comment_author_rss', get_comment_author() );
- 	echo $author;
- }
- 
  function get_comment_author_email() {
  	global $comment;
--- 142,145 ----
***************
*** 245,254 ****
  }
  
- function comment_text_rss() {
- 	$comment_text = get_comment_text();
- 	$comment_text = apply_filters('comment_text_rss', $comment_text);
- 	echo $comment_text;
- }
- 
  function get_comment_excerpt() {
  	global $comment;
--- 236,239 ----
***************
*** 300,320 ****
  }
  
- function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'wp-commentsrss2.php') {
- 	$url = comments_rss($commentsrssfilename);
- 	echo "<a href='$url'>$link_text</a>";
- }
- 
- function comments_rss($commentsrssfilename = 'wp-commentsrss2.php') {
- 	global $id;
- 	global $querystring_start, $querystring_equal, $querystring_separator;
- 
- 	if ('' != get_settings('permalink_structure'))
- 		$url = trailingslashit( get_permalink() ) . 'feed/';
- 	else
- 		$url = get_settings('siteurl') . "/$commentsrssfilename?p=$id";
- 
- 	return $url;
- }
- 
  function get_trackback_url() {
  	global $id;
--- 285,288 ----

Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** template-functions-general.php	2 Jan 2005 02:47:45 -0000	1.61
--- template-functions-general.php	7 Jan 2005 22:01:59 -0000	1.62
***************
*** 62,75 ****
  }
  
- function bloginfo_rss($show='') {
-     $info = strip_tags(get_bloginfo($show));
-     echo convert_chars($info);
- }
- 
- function bloginfo_unicode($show='') {
-     $info = get_bloginfo($show);
-     echo convert_chars($info);
- }
- 
  function get_bloginfo($show='') {
  
--- 62,65 ----
***************
*** 612,628 ****
  }
  
! function the_time($d='', $echo = true) {
!     global $id, $post;
!     if ($d=='') {
!         $the_time = mysql2date(get_settings('time_format'), $post->post_date);
!     } else {
!         $the_time = mysql2date($d, $post->post_date);
!     }
!     $the_time = apply_filters('the_time', $the_time);
!     if ($echo) {
!         echo $the_time;
!     } else {
!         return $the_time;
!     }
  }
  
--- 602,625 ----
  }
  
! function the_time( $d = '' ) {
! 	echo apply_filters('the_time', get_the_time( $d ) );
! }
! 
! function get_the_time( $d = '' ) {
! 	global $id, $post;
! 	if ( '' == $d )
! 		$the_time = date( get_settings('time_format'), get_post_time() );
! 	else
! 		$the_time = mysql2date( $d, get_post_time() );
! 	return apply_filters('get_the_time', $the_time);
! }
! 
! function get_post_time( $gmt = false ) { // returns timestamp
! 	global $post;
! 	if ( $gmt )
! 		$time = mysql2date('U', $post->post_date_gmt);
! 	else
! 		$time = mysql2date('U', $post->post_date);
! 	return apply_filters('get_the_time', $time);
  }
  

Index: template-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** template-functions.php	16 Dec 2004 23:18:15 -0000	1.54
--- template-functions.php	7 Jan 2005 22:01:59 -0000	1.55
***************
*** 20,22 ****
--- 20,24 ----
  require($curpath . 'comment-functions.php');
  
+ require($curpath . 'feed-functions.php');
+ 
  ?>
\ No newline at end of file

From rboren at users.sourceforge.net  Sun Jan  9 01:53:33 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Sun Jan  9 01:53:38 2005
Subject: [wp-cvs] wordpress wp-blog-header.php,1.110,1.111
Message-ID: <E1CnSGr-0001Jf-Nk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5054

Modified Files:
	wp-blog-header.php 
Log Message:
s/wp_did_template_redirect/wp_template_redirect/

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** wp-blog-header.php	3 Jan 2005 00:14:42 -0000	1.110
--- wp-blog-header.php	9 Jan 2005 01:53:31 -0000	1.111
***************
*** 206,211 ****
  // Template redirection
  if ($pagenow == 'index.php') {
! 	if ( !isset($wp_did_template_redirect) ) {
! 		$wp_did_template_redirect = true;
  		do_action('template_redirect', '');
  		if ( is_feed() ) {
--- 206,211 ----
  // Template redirection
  if ($pagenow == 'index.php') {
! 	if ( !isset($wp_template_redirect) ) {
! 		$wp_template_redirect = true;
  		do_action('template_redirect', '');
  		if ( is_feed() ) {

From rboren at users.sourceforge.net  Sun Jan  9 02:19:32 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Sun Jan  9 02:19:39 2005
Subject: [wp-cvs] wordpress wp-atom.php,1.16,1.17 wp-rss2.php,1.31,1.32
Message-ID: <E1CnSg1-0002eV-DU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10189

Modified Files:
	wp-atom.php wp-rss2.php 
Log Message:
Feed fixes from MooKitty.  Bug 644.

Index: wp-rss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss2.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wp-rss2.php	7 Jan 2005 22:01:58 -0000	1.31
--- wp-rss2.php	9 Jan 2005 02:19:30 -0000	1.32
***************
*** 39,43 ****
--- 39,47 ----
  <?php else : ?>
  		<description><?php the_excerpt_rss() ?></description>
+ 	<?php if ( strlen( $post->post_content ) > 0 ) : ?>
  		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+ 	<?php else : ?>
+ 		<content:encoded><![CDATA[<?php the_excerpt_rss() ?>]]></content:encoded>
+ 	<?php endif; ?>
  <?php endif; ?>
  		<wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
***************
*** 46,48 ****
  	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
  </channel>
! </rss>
\ No newline at end of file
--- 50,52 ----
  	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
  </channel>
! </rss>

Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wp-atom.php	7 Jan 2005 22:01:58 -0000	1.16
--- wp-atom.php	9 Jan 2005 02:19:30 -0000	1.17
***************
*** 43,46 ****
--- 43,47 ----
  		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
  <?php endif; ?>
+ <?php rss_enclosure(); ?>
  	</entry>
  	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>

From rboren at users.sourceforge.net  Sun Jan  9 02:40:08 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Sun Jan  9 02:40:15 2005
Subject: [wp-cvs] 
	wordpress/wp-includes template-functions-general.php, 1.62, 1.63
Message-ID: <E1CnSzx-0003i0-Nh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14225/wp-includes

Modified Files:
	template-functions-general.php 
Log Message:
Fix post time display.  Bug 636.

Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** template-functions-general.php	7 Jan 2005 22:01:59 -0000	1.62
--- template-functions-general.php	9 Jan 2005 02:40:06 -0000	1.63
***************
*** 607,615 ****
  
  function get_the_time( $d = '' ) {
- 	global $id, $post;
  	if ( '' == $d )
  		$the_time = date( get_settings('time_format'), get_post_time() );
  	else
! 		$the_time = mysql2date( $d, get_post_time() );
  	return apply_filters('get_the_time', $the_time);
  }
--- 607,614 ----
  
  function get_the_time( $d = '' ) {
  	if ( '' == $d )
  		$the_time = date( get_settings('time_format'), get_post_time() );
  	else
! 		$the_time = date( $d, get_post_time() );
  	return apply_filters('get_the_time', $the_time);
  }

From rboren at users.sourceforge.net  Sun Jan  9 21:24:37 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Sun Jan  9 21:24:46 2005
Subject: [wp-cvs] wordpress/wp-admin options-permalink.php,1.52,1.53
Message-ID: <E1CnkYA-0003Mn-FQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12931/wp-admin

Modified Files:
	options-permalink.php 
Log Message:
Update codex link.  Patch from 2fargon for bug 646.

Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** options-permalink.php	23 Dec 2004 00:53:56 -0000	1.52
--- options-permalink.php	9 Jan 2005 21:24:35 -0000	1.53
***************
*** 49,53 ****
  <div class="wrap"> 
    <h2><?php _e('Edit Permalink Structure') ?></h2> 
!   <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and longevity of your links. A <a href="http://codex.wordpress.org/Permalink_Structure">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
  
  <?php if ($is_apache) : ?>
--- 49,53 ----
  <div class="wrap"> 
    <h2><?php _e('Edit Permalink Structure') ?></h2> 
!   <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and longevity of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
  
  <?php if ($is_apache) : ?>

From rboren at users.sourceforge.net  Mon Jan 10 04:03:54 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Mon Jan 10 04:04:01 2005
Subject: [wp-cvs] wordpress/wp-admin menu.php,1.37,1.38
Message-ID: <E1CnqmZ-0001QE-0S@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5457

Modified Files:
	menu.php 
Log Message:
Grammar fix.  Bug 652.

Index: menu.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** menu.php	24 Dec 2004 20:55:36 -0000	1.37
--- menu.php	10 Jan 2005 04:03:51 -0000	1.38
***************
*** 52,56 ****
  
  if (! user_can_access_admin_page()) {
! 	die( __('You have do not have sufficient permissions to access this page.') );
  }
  
--- 52,56 ----
  
  if (! user_can_access_admin_page()) {
! 	die( __('You do not have sufficient permissions to access this page.') );
  }
  

From saxmatt at users.sourceforge.net  Mon Jan 10 20:12:58 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Mon Jan 10 20:13:05 2005
Subject: [wp-cvs] wordpress/wp-admin install.php,1.50,1.51
Message-ID: <E1Co5uM-0002if-Gd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10434/wp-admin

Modified Files:
	install.php 
Log Message:
No email on the default comment.

Index: install.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/install.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** install.php	14 Dec 2004 07:55:26 -0000	1.50
--- install.php	10 Jan 2005 20:12:55 -0000	1.51
***************
*** 150,154 ****
  
  // Default comment
! $wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content) VALUES ('1', 'Mr WordPress', 'mr@wordpress.org', 'http://wordpress.org', '127.0.0.1', '$now', '$now_gmt', 'Hi, this is a comment.<br />To delete a comment, just log in, and view the posts\' comments, there you will have the option to edit or delete them.')");
  
  // Set up admin user
--- 150,154 ----
  
  // Default comment
! $wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content) VALUES ('1', 'Mr WordPress', '', 'http://wordpress.org', '127.0.0.1', '$now', '$now_gmt', 'Hi, this is a comment.<br />To delete a comment, just log in, and view the posts\' comments, there you will have the option to edit or delete them.')");
  
  // Set up admin user

From saxmatt at users.sourceforge.net  Mon Jan 10 20:21:09 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Mon Jan 10 20:21:23 2005
Subject: [wp-cvs] wordpress/wp-includes comment-functions.php, 1.12,
	1.13 functions-post.php, 1.25, 1.26
Message-ID: <E1Co62H-0003E3-Q9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12293/wp-includes

Modified Files:
	comment-functions.php functions-post.php 
Log Message:
Spam tastes great, we should eat more of it. Add 'spam' approval value, and basic blacklist.

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** comment-functions.php	7 Jan 2005 22:01:58 -0000	1.12
--- comment-functions.php	10 Jan 2005 20:21:05 -0000	1.13
***************
*** 725,729 ****
  	if ( 1 == get_settings('comment_whitelist')) {
  		if( $author != '' && $email != '' ) {
! 		    $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author_email = '$email' and comment_approved = '1' ");
  		    if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
  			return true;
--- 725,729 ----
  	if ( 1 == get_settings('comment_whitelist')) {
  		if( $author != '' && $email != '' ) {
! 		    $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' ");
  		    if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
  			return true;
***************
*** 733,746 ****
  	}
  
- 	// Useless numeric encoding is a pretty good spam indicator:
- 	// Extract entities:
- 	if (preg_match_all('/&#(\d+);/',$comment,$chars)) {
- 		foreach ($chars[1] as $char) {
- 			// If it's an encoded char in the normal ASCII set, reject
- 			if ($char < 128)
- 				return false;
- 		}
- 	}
- 
  	$mod_keys = trim( get_settings('moderation_keys') );
  	if ('' == $mod_keys )
--- 733,736 ----

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** functions-post.php	7 Jan 2005 01:21:12 -0000	1.25
--- functions-post.php	10 Jan 2005 20:21:06 -0000	1.26
***************
*** 382,387 ****
  }
  
  
! function wp_new_comment( $commentdata ) {
  	global $wpdb;
  
--- 382,424 ----
  }
  
+ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) {
+ 	global $wpdb;
  
! 	if ( preg_match_all('/&#(\d+);/', $comment, $chars) ) {
! 		foreach ($chars[1] as $char) {
! 			// If it's an encoded char in the normal ASCII set, reject
! 			if ($char < 128)
! 				return true;
! 		}
! 	}
! 
! 	$mod_keys = trim( get_settings('blacklist_keys') );
! 	if ('' == $mod_keys )
! 		return false; // If moderation keys are empty
! 	$words = explode("\n", $mod_keys );
! 
! 	foreach ($words as $word) {
! 		$word = trim($word);
! 
! 		// Skip empty lines
! 		if ( empty($word) ) { continue; }
! 
! 		// Do some escaping magic so that '#' chars in the 
! 		// spam words don't break things:
! 		$word = preg_quote($word, '#');
! 		
! 		$pattern = "#$word#i"; 
! 		if ( preg_match($pattern, $author    ) ) return true;
! 		if ( preg_match($pattern, $email     ) ) return true;
! 		if ( preg_match($pattern, $url       ) ) return true;
! 		if ( preg_match($pattern, $comment   ) ) return true;
! 		if ( preg_match($pattern, $user_ip   ) ) return true;
! 		if ( preg_match($pattern, $user_agent) ) return true;
! 	}
! 
! 	return false;
! }
! 
! function wp_new_comment( $commentdata, $spam = false ) {
  	global $wpdb;
  
***************
*** 413,420 ****
  	}
  
! 	if( check_comment($author, $email, $url, $comment, $user_ip, $user_agent) )
  		$approved = 1;
  	else
  		$approved = 0;
  
  	$result = $wpdb->query("INSERT INTO $wpdb->comments 
--- 450,459 ----
  	}
  
! 	if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent) )
  		$approved = 1;
  	else
  		$approved = 0;
+ 	if ( wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) )
+ 		$approved = 'spam';
  
  	$result = $wpdb->query("INSERT INTO $wpdb->comments 
***************
*** 427,435 ****
  	do_action('comment_post', $comment_id);
  
! 	if ( !$approved )
! 		wp_notify_moderator($comment_id);
! 
! 	if ( get_settings('comments_notify') && $approved )
! 		wp_notify_postauthor($comment_id, 'comment');
  
  	return $result;
--- 466,476 ----
  	do_action('comment_post', $comment_id);
  
! 	if ( 'spam' != $approved ) { // If it's spam save it silently for later crunching
! 		if ( !$approved )
! 			wp_notify_moderator($comment_id);
! 	
! 		if ( get_settings('comments_notify') && $approved )
! 			wp_notify_postauthor($comment_id, 'comment');
! 	}
  
  	return $result;

From saxmatt at users.sourceforge.net  Mon Jan 10 20:21:07 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Mon Jan 10 20:21:31 2005
Subject: [wp-cvs] wordpress/wp-admin edit-comments.php, 1.42,
	1.43 options-discussion.php, 1.24, 1.25 upgrade-schema.php,
	1.16, 1.17
Message-ID: <E1Co62G-0003Du-I1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12293/wp-admin

Modified Files:
	edit-comments.php options-discussion.php upgrade-schema.php 
Log Message:
Spam tastes great, we should eat more of it. Add 'spam' approval value, and basic blacklist.

Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** edit-comments.php	19 Dec 2004 00:21:14 -0000	1.42
--- edit-comments.php	10 Jan 2005 20:21:04 -0000	1.43
***************
*** 67,71 ****
  		$offset = 0;
  
! 	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments ORDER BY comment_date DESC LIMIT $offset,20");
  }
  if ('view' == $mode) {
--- 67,71 ----
  		$offset = 0;
  
! 	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $offset,20");
  }
  if ('view' == $mode) {

Index: upgrade-schema.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** upgrade-schema.php	30 Dec 2004 10:58:05 -0000	1.16
--- upgrade-schema.php	10 Jan 2005 20:21:04 -0000	1.17
***************
*** 23,27 ****
    comment_content text NOT NULL,
    comment_karma int(11) NOT NULL default '0',
!   comment_approved enum('0','1') NOT NULL default '1',
    comment_agent varchar(255) NOT NULL default '',
    comment_type varchar(20) NOT NULL default '',
--- 23,27 ----
    comment_content text NOT NULL,
    comment_karma int(11) NOT NULL default '0',
!   comment_approved enum('0','1','spam') NOT NULL default '1',
    comment_agent varchar(255) NOT NULL default '',
    comment_type varchar(20) NOT NULL default '',
***************
*** 213,216 ****
--- 213,217 ----
  	add_option('comment_whitelist', 1);
  	add_option('page_uris');
+ 	add_option('blacklist_keys');
  
  	// Delete unused options
***************
*** 221,228 ****
  
  	// Set up a few options not to load by default
! 	$fatoptions = array( 'moderation_keys', 'recently_edited' );
  	foreach ($fatoptions as $fatoption) :
  		$wpdb->query("UPDATE $wpdb->options SET `autoload` = 'no' WHERE option_name = '$fatoption'");
  	endforeach;
  }
! ?>
--- 222,230 ----
  
  	// Set up a few options not to load by default
! 	$fatoptions = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
  	foreach ($fatoptions as $fatoption) :
  		$wpdb->query("UPDATE $wpdb->options SET `autoload` = 'no' WHERE option_name = '$fatoption'");
  	endforeach;
  }
! 
! ?>
\ No newline at end of file

Index: options-discussion.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-discussion.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** options-discussion.php	19 Oct 2004 03:03:04 -0000	1.24
--- options-discussion.php	10 Jan 2005 20:21:04 -0000	1.25
***************
*** 23,27 ****
  	<form name="form1" method="post" action="options.php"> 
  		<input type="hidden" name="action" value="update" /> 
! 		<input type="hidden" name="page_options" value="'default_pingback_flag','default_ping_status','default_comment_status','comments_notify','moderation_notify','comment_moderation','require_name_email','comment_whitelist','comment_max_links','moderation_keys'" /> 
  <fieldset class="options">
          <legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> 
--- 23,27 ----
  	<form name="form1" method="post" action="options.php"> 
  		<input type="hidden" name="action" value="update" /> 
! 		<input type="hidden" name="page_options" value="'default_pingback_flag','default_ping_status','default_comment_status','comments_notify','moderation_notify','comment_moderation','require_name_email','comment_whitelist','comment_max_links','moderation_keys','blacklist_keys'" /> 
  <fieldset class="options">
          <legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> 
***************
*** 80,86 ****
  		</p> 
  		<p>
! 			<a id="retrospambutton" href="options-discussion.php?action=retrospam" title="Click this link to check old comments for spam that your current filters would catch.">Check past comments against current word list</a>
   		</p> 
  </fieldset>
  		<p class="submit"> 
      	<input type="submit" name="Submit" value="<?php _e('Update Options') ?>" /> 
--- 80,93 ----
  		</p> 
  		<p>
! 			<a id="retrospambutton" href="options-discussion.php?action=retrospam"><?php _e('Check past comments against moderation list'); ?></a>
   		</p> 
  </fieldset>
+ <fieldset class="options">
+     <legend><?php _e('Comment Blacklist') ?></legend>
+     <p><?php _e('This is a list of words that you want completely blacklisted from your blog. Be very careful what you add here, because if a comment matches something here it will be completely nuked and there will be no notification. Remember that partial words can match, so if there is any chance something here might match it would be better to put it in the moderation box above.') ?></p>
+ 		<p> 
+ 			<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> 
+ 		</p> 
+ </fieldset>
  		<p class="submit"> 
      	<input type="submit" name="Submit" value="<?php _e('Update Options') ?>" /> 

From saxmatt at users.sourceforge.net  Mon Jan 10 20:26:12 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Mon Jan 10 20:26:19 2005
Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.26,1.27
Message-ID: <E1Co67B-0003bx-KY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13866/wp-includes

Modified Files:
	functions-post.php 
Log Message:
Add more hooks into commenting.

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** functions-post.php	10 Jan 2005 20:21:06 -0000	1.26
--- functions-post.php	10 Jan 2005 20:26:10 -0000	1.27
***************
*** 385,388 ****
--- 385,390 ----
  	global $wpdb;
  
+ 	do_action('wp_blacklist_check', '');
+ 
  	if ( preg_match_all('/&#(\d+);/', $comment, $chars) ) {
  		foreach ($chars[1] as $char) {
***************
*** 447,450 ****
--- 449,453 ----
  		$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.') );
  	}
***************
*** 456,459 ****
--- 459,464 ----
  	if ( wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) )
  		$approved = 'spam';
+ 	
+ 	$approved = apply_filters('pre_comment_approved', $approved);
  
  	$result = $wpdb->query("INSERT INTO $wpdb->comments 

From saxmatt at users.sourceforge.net  Mon Jan 10 23:21:45 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Mon Jan 10 23:21:55 2005
Subject: [wp-cvs] wordpress/wp-includes comment-functions.php, 1.13,
	1.14 functions-post.php, 1.27, 1.28
Message-ID: <E1Co8r6-0005ne-5W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22286/wp-includes

Modified Files:
	comment-functions.php functions-post.php 
Log Message:
Whitelist trackbacks and pingbacks from domains in blogroll.

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** comment-functions.php	10 Jan 2005 20:21:05 -0000	1.13
--- comment-functions.php	10 Jan 2005 23:21:42 -0000	1.14
***************
*** 714,718 ****
  }
  
! function check_comment($author, $email, $url, $comment, $user_ip, $user_agent) {
  	global $wpdb;
  
--- 714,718 ----
  }
  
! function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) {
  	global $wpdb;
  
***************
*** 725,733 ****
  	if ( 1 == get_settings('comment_whitelist')) {
  		if( $author != '' && $email != '' ) {
! 		    $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' ");
! 		    if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
! 			return true;
! 		} else {
! 			return false;
  		}
  	}
--- 725,738 ----
  	if ( 1 == get_settings('comment_whitelist')) {
  		if( $author != '' && $email != '' ) {
! 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' ");
! 			if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
! 				return true;
! 		}
! 		if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
! 			$uri = parse_url($url);
! 			$domain = $uri['host'];
! 			$in_blogroll = $wpdb->get_var("SELECT link_id FROM $wpdb->links WHERE link_url LIKE ('%$domain%') LIMIT 1");
! 			if ( $in_blogroll )
! 				return true;
  		}
  	}

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** functions-post.php	10 Jan 2005 20:26:10 -0000	1.27
--- functions-post.php	10 Jan 2005 23:21:42 -0000	1.28
***************
*** 453,457 ****
  	}
  
! 	if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent) )
  		$approved = 1;
  	else
--- 453,457 ----
  	}
  
! 	if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) )
  		$approved = 1;
  	else

From saxmatt at users.sourceforge.net  Mon Jan 10 23:31:00 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Mon Jan 10 23:31:08 2005
Subject: [wp-cvs] wordpress/wp-admin install.php,1.51,1.52
Message-ID: <E1Co900-0006Bf-RP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23778/wp-admin

Modified Files:
	install.php 
Log Message:
Adding RSS feeds for everybody.

Index: install.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/install.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** install.php	10 Jan 2005 20:12:55 -0000	1.51
--- install.php	10 Jan 2005 23:30:57 -0000	1.52
***************
*** 130,141 ****
  // Now drop in some default links
  $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, 'Blogroll')");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://blog.carthik.net/index.php', 'Carthik', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://zengun.org/weblog/', 'Michel', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://boren.nu/', 'Ryan', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://photomatt.net/', 'Matt', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://zed1.com/journalized/', 'Mike', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://www.alexking.org/', 'Alex', 1);");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category) VALUES ('http://dougal.gunters.org/', 'Dougal', 1);");
  
  // Default category
--- 130,141 ----
  // Now drop in some default links
  $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, 'Blogroll')");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blog.carthik.net/index.php', 'Carthik', 1' 'http://blog.carthik.net/feed/');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php');");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/');");
  
  // Default category

From rboren at users.sourceforge.net  Tue Jan 11 01:08:04 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Tue Jan 11 01:08:09 2005
Subject: [wp-cvs] wordpress/wp-content/themes/default sidebar.php,1.3,1.4
Message-ID: <E1CoAVw-0003DO-Tz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-content/themes/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12350

Modified Files:
	sidebar.php 
Log Message:
Start marking default theme for translation.

Index: sidebar.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/default/sidebar.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sidebar.php	4 Jan 2005 06:39:38 -0000	1.3
--- sidebar.php	11 Jan 2005 01:08:01 -0000	1.4
***************
*** 13,19 ****
  
  			<li>
! 			<?php /* If this is a category archive */ if (is_category()) { ?>				
! 			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
! 			for the '<?php echo single_cat_title(); ?>' category.</p>
  			
  			<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
--- 13,18 ----
  
  			<li>
! 			<?php /* If this is a category archive */ if (is_category()) { ?>
! 			<p><?php printf( __('You are currently browsing the %1$s weblog archives for the \'%2$s\' category.'), '<a href="' . get_settings('siteurl') .'">' . get_bloginfo('name') . '</a>', single_cat_title('', false) ) ?></p>
  			
  			<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>

From saxmatt at users.sourceforge.net  Tue Jan 11 02:56:46 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Tue Jan 11 02:56:57 2005
Subject: [wp-cvs] wordpress wp-trackback.php,1.27,1.28
Message-ID: <E1CoCDC-0008Vj-KU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32703

Modified Files:
	wp-trackback.php 
Log Message:
Don't accept duplicate pings

Index: wp-trackback.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-trackback.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wp-trackback.php	16 Dec 2004 02:56:57 -0000	1.27
--- wp-trackback.php	11 Jan 2005 02:56:43 -0000	1.28
***************
*** 81,84 ****
--- 81,88 ----
  	$comment_type = 'trackback';
  
+ 	$dupe = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_author_url = '$comment_author_url'");
+ 	if ( $dupe )
+ 		trackback_response(1, 'We already have a ping from that URI for this post.');
+ 
  	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
  

From donncha at users.sourceforge.net  Tue Jan 11 17:07:58 2005
From: donncha at users.sourceforge.net (Donncha O Caoimh)
Date: Tue Jan 11 17:08:05 2005
Subject: [wp-cvs] wordpress/wp-includes functions.php,1.234,1.235
Message-ID: <E1CoPUs-0002rX-Hs@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10961

Modified Files:
	functions.php 
Log Message:
removed images from enclosure scanning.


Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** functions.php	6 Jan 2005 10:07:52 -0000	1.234
--- functions.php	11 Jan 2005 17:07:54 -0000	1.235
***************
*** 784,788 ****
                          $type = substr( $response, strpos( $response, "Content-Type:" ) + 14 );
                          $type = substr( $type, 0, strpos( $type, "\n" ) + 1 );
!                         $allowed_types = array( "video", "audio", "image" );
                          if( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
                              $meta_value = "$url\n$len\n$type\n";
--- 784,788 ----
                          $type = substr( $response, strpos( $response, "Content-Type:" ) + 14 );
                          $type = substr( $type, 0, strpos( $type, "\n" ) + 1 );
!                         $allowed_types = array( "video", "audio" );
                          if( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
                              $meta_value = "$url\n$len\n$type\n";
***************
*** 1624,1626 ****
  }
  
! ?>
\ No newline at end of file
--- 1624,1626 ----
  }
  
! ?>

From saxmatt at users.sourceforge.net  Tue Jan 11 18:47:10 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Tue Jan 11 18:47:18 2005
Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.28,1.29
Message-ID: <E1CoR2s-0008Ga-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31771/wp-includes

Modified Files:
	functions-post.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=668

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** functions-post.php	10 Jan 2005 23:21:42 -0000	1.28
--- functions-post.php	11 Jan 2005 18:47:07 -0000	1.29
***************
*** 448,454 ****
  		$time_lastcomment = mysql2date('U', $lasttime);
  		$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.') );
  	}
  
--- 448,455 ----
  		$time_lastcomment = mysql2date('U', $lasttime);
  		$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.') );
+ 		}
  	}
  

From saxmatt at users.sourceforge.net  Tue Jan 11 20:22:14 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Tue Jan 11 20:22:20 2005
Subject: [wp-cvs] wordpress/wp-admin install.php,1.52,1.53
Message-ID: <E1CoSWt-0005yc-0t@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22940/wp-admin

Modified Files:
	install.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=669

Index: install.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/install.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** install.php	10 Jan 2005 23:30:57 -0000	1.52
--- install.php	11 Jan 2005 20:22:11 -0000	1.53
***************
*** 130,134 ****
  // Now drop in some default links
  $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, 'Blogroll')");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blog.carthik.net/index.php', 'Carthik', 1' 'http://blog.carthik.net/feed/');");
  $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/');");
  $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/');");
--- 130,134 ----
  // Now drop in some default links
  $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, 'Blogroll')");
! $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blog.carthik.net/index.php', 'Carthik', 1, 'http://blog.carthik.net/feed/');");
  $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/');");
  $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/');");

From saxmatt at users.sourceforge.net  Tue Jan 11 20:25:16 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Tue Jan 11 20:25:20 2005
Subject: [wp-cvs] wordpress/wp-content/plugins google-hilite.php,1.7,NONE
Message-ID: <E1CoSZo-000693-DD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-content/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23617/wp-content/plugins

Removed Files:
	google-hilite.php 
Log Message:
Moving google highlight to http://dev.wp-plugins.org

--- google-hilite.php DELETED ---

From saxmatt at users.sourceforge.net  Tue Jan 11 22:42:11 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Tue Jan 11 22:42:22 2005
Subject: [wp-cvs] wordpress/wp-includes functions-post.php,1.29,1.30
Message-ID: <E1CoUiK-0005Ne-4C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20668/wp-includes

Modified Files:
	functions-post.php 
Log Message:
Check everything for entities.

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** functions-post.php	11 Jan 2005 18:47:07 -0000	1.29
--- functions-post.php	11 Jan 2005 22:42:09 -0000	1.30
***************
*** 387,391 ****
  	do_action('wp_blacklist_check', '');
  
! 	if ( preg_match_all('/&#(\d+);/', $comment, $chars) ) {
  		foreach ($chars[1] as $char) {
  			// If it's an encoded char in the normal ASCII set, reject
--- 387,391 ----
  	do_action('wp_blacklist_check', '');
  
! 	if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) {
  		foreach ($chars[1] as $char) {
  			// If it's an encoded char in the normal ASCII set, reject

From rboren at users.sourceforge.net  Wed Jan 12 23:33:09 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Wed Jan 12 23:33:20 2005
Subject: [wp-cvs] wordpress/wp-admin admin-header.php,1.39,1.40
Message-ID: <E1CorzC-00005X-En@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv327

Modified Files:
	admin-header.php 
Log Message:
Fix double include when handling plugin admin pages.  Bug 649.  Hat tip:  morganiq

Index: admin-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-header.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** admin-header.php	24 Dec 2004 01:34:46 -0000	1.39
--- admin-header.php	12 Jan 2005 23:33:07 -0000	1.40
***************
*** 1,3 ****
! <?php require_once('admin.php'); ?>
  <?php get_admin_page_title(); ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- 1,3 ----
! <?php if (!isset($_GET["page"])) require_once('admin.php'); ?>
  <?php get_admin_page_title(); ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

From rboren at users.sourceforge.net  Fri Jan 14 05:52:13 2005
From: rboren at users.sourceforge.net (Ryan Boren)
Date: Fri Jan 14 05:52:24 2005
Subject: [wp-cvs] wordpress wp-blog-header.php,1.111,1.112
Message-ID: <E1CpKNZ-0001jX-Sw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6659

Modified Files:
	wp-blog-header.php 
Log Message:
If template redirection is turned off, we still need to redirect for feeds and trackbacks so that permalinks do not break.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** wp-blog-header.php	9 Jan 2005 01:53:31 -0000	1.111
--- wp-blog-header.php	14 Jan 2005 05:52:10 -0000	1.112
***************
*** 206,210 ****
  // Template redirection
  if ($pagenow == 'index.php') {
! 	if ( !isset($wp_template_redirect) ) {
  		$wp_template_redirect = true;
  		do_action('template_redirect', '');
--- 206,221 ----
  // Template redirection
  if ($pagenow == 'index.php') {
! 	if ( isset($wp_template_redirect) && $wp_template_redirect != true) {
! 		// If $wp_template_redirect is set to false, template redirection
! 		// should be skipped for everything except feeds and trackbacks.
! 		$wp_template_redirect = true;
! 		if ( is_feed() ) {
! 			include(ABSPATH . '/wp-feed.php');
! 			exit;
! 		} else if ( is_trackback() ) {
! 			include(ABSPATH . '/wp-trackback.php');
! 			exit;
! 		}
! 	} elseif ( !isset($wp_template_redirect) ) {
  		$wp_template_redirect = true;
  		do_action('template_redirect', '');

From saxmatt at users.sourceforge.net  Fri Jan 14 06:11:08 2005
From: saxmatt at users.sourceforge.net (Matthew Mullenweg)
Date: Fri Jan 14 06:11:41 2005
Subject: [wp-cvs] wordpress/wp-content/themes/default/images kubrickbg.jpg,
	1.1, 1.2 kubrickbgcolor.jpg, 1.1, 1.2 kubrickbgwide.jpg, 1.1,
	1.2 kubrickfooter.jpg, 1.1, 1.2 kubrickheader.jpg, 1.1,
	1.2 kubricklogo.jpg, 1.1, NONE kubrickportrait.png, 1.1, NONE
Message-ID: <E1CpKgD-0002VX-4L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/cafelog/wordpress/wp-content/themes/default/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9623/wp-content/themes/default/images

Modified Files:
	kubrickbg.jpg kubrickbgcolor.jpg kubrickbgwide.jpg 
	kubrickfooter.jpg kubrickheader.jpg 
Removed Files:
	kubricklogo.jpg kubrickportrait.png 
Log Message:
Fixing the images (I hope)

Index: kubrickheader.jpg
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/default/images/kubrickheader.jpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsX48jeF and /tmp/cvspYFE9J differ

Index: kubrickfooter.jpg
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/default/images/kubrickfooter.jpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsCH0Xvj and /tmp/cvsxxHQRo differ

--- kubrickportrait.png DELETED ---

--- kubricklogo.jpg DELETED ---

Index: kubrickbg.jpg
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/default/images/kubrickbg.jpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2