[wp-cvs] wordpress wp-atom.php, 1.12, 1.13 wp-blog-header.php, 1.83, 1.84 wp-commentsrss2.php, 1.18, 1.19 wp-locations.php, 1.5, 1.6 wp-mail.php, 1.18, 1.19 wp-rdf.php, 1.19, 1.20 wp-rss.php, 1.19, 1.20 wp-trackback.php, 1.16, 1.17 xmlrpc.php, 1.73, 1.74

Matthew Mullenweg saxmatt at users.sourceforge.net
Sun Sep 5 00:24:30 UTC 2004


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

Modified Files:
	wp-atom.php wp-blog-header.php wp-commentsrss2.php 
	wp-locations.php wp-mail.php wp-rdf.php wp-rss.php 
	wp-trackback.php xmlrpc.php 
Log Message:
Massive options cleanup and another step of cleaning up the upgrade/install.

Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wp-atom.php	30 Aug 2004 07:16:39 -0000	1.12
--- wp-atom.php	5 Sep 2004 00:24:28 -0000	1.13
***************
*** 14,19 ****
  <feed version="0.3"
    xmlns="http://purl.org/atom/ns#"
!   xmlns:dc="http://purl.org/dc/elements/1.1/"
!   xml:lang="<?php echo get_settings('rss_language'); ?>">
  	<title><?php bloginfo_rss('name') ?></title>
  	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
--- 14,18 ----
  <feed version="0.3"
    xmlns="http://purl.org/atom/ns#"
!   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') ?>" />

Index: wp-locations.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-locations.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wp-locations.php	30 Aug 2004 07:16:39 -0000	1.5
--- wp-locations.php	5 Sep 2004 00:24:28 -0000	1.6
***************
*** 18,27 ****
          if (get_settings('rss_use_excerpt')) {
  ?>
!         <note><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?>
          </note>
  <?php
          } else { // use content
  ?>
!         <note><?php the_excerpt_rss('', 0, '', get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?></note>
  <?php
          } // end else use content
--- 18,27 ----
          if (get_settings('rss_use_excerpt')) {
  ?>
!         <note><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?>
          </note>
  <?php
          } else { // use content
  ?>
!         <note><?php the_excerpt_rss('', 0, '', get_settings('rss_excerpt_length')) ?></note>
  <?php
          } // end else use content

Index: wp-rss.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wp-rss.php	30 Aug 2004 07:16:39 -0000	1.19
--- wp-rss.php	5 Sep 2004 00:24:28 -0000	1.20
***************
*** 31,35 ****
  } else { // use content
  ?>
!             <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?></description>
  <?php
  } // end else use content
--- 31,35 ----
  } else { // use content
  ?>
!             <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
  <?php
  } // end else use content

Index: wp-commentsrss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-commentsrss2.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wp-commentsrss2.php	30 Aug 2004 07:16:39 -0000	1.18
--- wp-commentsrss2.php	5 Sep 2004 00:24:28 -0000	1.19
***************
*** 21,25 ****
  	<link><?php (isset($_REQUEST["p"]) || isset($_REQUEST["name"])) ? permalink_single_rss() : bloginfo_rss("url") ?></link>
  	<description><?php bloginfo_rss("description") ?></description>
- 	<language><?php echo get_settings('rss_language'); ?></language>
  	<pubDate><?php echo gmdate('r'); ?></pubDate>
  	<generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator>
--- 21,24 ----

Index: xmlrpc.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/xmlrpc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** xmlrpc.php	28 Aug 2004 09:05:27 -0000	1.73
--- xmlrpc.php	5 Sep 2004 00:24:28 -0000	1.74
***************
*** 227,263 ****
  
  	if (user_pass_ok($username,$password)) {
- 
  		$blog_URL = get_settings('home') .'/' . get_settings('blogfilename');
! 
! 		$postdata = get_postdata($post_ID);
! 
! 		if (!($postdata===false)) {
! 
! 			$title = preg_replace('/[^a-zA-Z0-9_\.-]/', '_', $postdata['Title']);
! 
! 			// this code is blatantly derived from permalink_link()
! 			$archive_mode = get_settings('archive_mode');
! 			switch($archive_mode) {
! 				case 'daily':
! 					$post_URL = $blog_URL.$querystring_start.'m'.$querystring_equal.substr($postdata['Date'],0,4).substr($postdata['Date'],5,2).substr($postdata['Date'],8,2).'#'.$title;
! 					break;
! 				case 'monthly':
! 					$post_URL = $blog_URL.$querystring_start.'m'.$querystring_equal.substr($postdata['Date'],0,4).substr($postdata['Date'],5,2).'#'.$title;
! 					break;
! 				case 'weekly':
! 					if((!isset($cacheweekly)) || (empty($cacheweekly[$postdata['Date']]))) {
! 						$sql = "SELECT WEEK('".$postdata['Date']."') as wk";
! 			$row = $wpdb->get_row($sql);
! 						$cacheweekly[$postdata['Date']] = $row->wk;
! 					}
! 					$post_URL = $blog_URL.$querystring_start.'m'.$querystring_equal.substr($postdata['Date'],0,4).$querystring_separator.'w'.$querystring_equal.$cacheweekly[$postdata['Date']].'#'.$title;
! 					break;
! 				case 'postbypost':
! 					$post_URL = $blog_URL.$querystring_start.'p'.$querystring_equal.$post_ID;
! 					break;
! 			}
! 		} else {
! 			$err = 'This post ID ('.$post_ID.') does not correspond to any post here.';
! 		}
  
  		if ($err) {
--- 227,232 ----
  
  	if (user_pass_ok($username,$password)) {
  		$blog_URL = get_settings('home') .'/' . get_settings('blogfilename');
! 		$post_URL = get_permalink($post_ID);
  
  		if ($err) {
***************
*** 1538,1547 ****
  	global $wpdb, $wp_version; 
  
- 	    
- 	if (!get_settings('use_pingback')) {
- 		return new xmlrpcresp(new xmlrpcval('Sorry, this weblog does not allow you to pingback its posts.'));
- 	}
- 
- 
  	//$log = debug_fopen('./xmlrpc.log', 'w');
  
--- 1507,1510 ----

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** wp-blog-header.php	27 Aug 2004 20:59:37 -0000	1.83
--- wp-blog-header.php	5 Sep 2004 00:24:28 -0000	1.84
***************
*** 151,155 ****
  }
  
- $archive_mode = get_settings('archive_mode');
  $use_gzipcompression = get_settings('gzipcompression');
  
--- 151,154 ----

Index: wp-mail.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-mail.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wp-mail.php	27 Jul 2004 15:04:37 -0000	1.18
--- wp-mail.php	5 Sep 2004 00:24:28 -0000	1.19
***************
*** 8,13 ****
  $time_difference = get_settings('gmt_offset') * 3600;
  
! $phone_delim = get_settings('use_phoneemail');
! if (empty($phone_delim)) $phone_delim = '::';
  
  $pop3 = new POP3();
--- 8,12 ----
  $time_difference = get_settings('gmt_offset') * 3600;
  
! $phone_delim = '::';
  
  $pop3 = new POP3();

Index: wp-trackback.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-trackback.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wp-trackback.php	30 Aug 2004 07:16:39 -0000	1.16
--- wp-trackback.php	5 Sep 2004 00:24:28 -0000	1.17
***************
*** 29,35 ****
  	@header('Content-Type: text/xml; charset=' . get_settings('blog_charset'));
  
- 	if (!get_settings('use_trackback'))
- 		trackback_response(1, 'Sorry, this weblog does not allow you to trackback its posts.');
- 
  	$pingstatus = $wpdb->get_var("SELECT ping_status FROM $wpdb->posts WHERE ID = $tb_id");
  
--- 29,32 ----

Index: wp-rdf.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rdf.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wp-rdf.php	30 Aug 2004 07:16:39 -0000	1.19
--- wp-rdf.php	5 Sep 2004 00:24:28 -0000	1.20
***************
*** 26,30 ****
  	<link><?php bloginfo_rss('url') ?></link>
  	<description><?php bloginfo_rss('description') ?></description>
- 	<dc:language><?php echo get_settings('rss_language'); ?></dc:language>
  	<dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></dc:date>
  	<admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $wp_version ?>"/>
--- 26,29 ----




More information about the cvs mailing list