summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--wp-inst/wp-admin/wp-admin.css2
-rw-r--r--wp-inst/wp-content/themes/default/archive.php4
-rw-r--r--wp-inst/wp-content/themes/default/functions.php6
-rw-r--r--wp-inst/wp-content/themes/default/header.php6
-rw-r--r--wp-inst/wp-content/themes/default/index.php2
-rw-r--r--wp-inst/wp-content/themes/default/search.php10
-rw-r--r--wp-inst/wp-includes/default-filters.php1
-rw-r--r--wp-inst/wp-includes/functions.php10
-rw-r--r--wp-inst/wp-includes/pluggable-functions.php4
-rw-r--r--wp-inst/wp-includes/template-functions-general.php4
-rw-r--r--wp-inst/wp-includes/vars.php5
-rw-r--r--wp-inst/xmlrpc.php22
12 files changed, 47 insertions, 29 deletions
diff --git a/wp-inst/wp-admin/wp-admin.css b/wp-inst/wp-admin/wp-admin.css
index 7bf1f85..6045f98 100644
--- a/wp-inst/wp-admin/wp-admin.css
+++ b/wp-inst/wp-admin/wp-admin.css
@@ -742,7 +742,7 @@ table .vers, table .name {
#moremeta .dbx-handle {
padding: 6px 1em 2px;
font-size: 12px;
- background: url(images/box-head.gif) no-repeat;
+ background: url(images/box-head.gif) no-repeat right;
}
#moremeta .dbx-box {
diff --git a/wp-inst/wp-content/themes/default/archive.php b/wp-inst/wp-content/themes/default/archive.php
index b9f346e..0aadc8f 100644
--- a/wp-inst/wp-content/themes/default/archive.php
+++ b/wp-inst/wp-content/themes/default/archive.php
@@ -40,10 +40,10 @@
<small><?php the_time('l, F jS, Y') ?></small>
<div class="entry">
- <?php the_excerpt() ?>
+ <?php the_content() ?>
</div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
diff --git a/wp-inst/wp-content/themes/default/functions.php b/wp-inst/wp-content/themes/default/functions.php
index f94f4af..90a2846 100644
--- a/wp-inst/wp-content/themes/default/functions.php
+++ b/wp-inst/wp-content/themes/default/functions.php
@@ -1,10 +1,10 @@
<?php
function kubrick_head() {
- $head = "<style type=\"text/css\">\n";
+ $head = "<style type='text/css'>\n<!--";
$output = '';
if ( kubrick_header_image() ) {
- $url = kubrick_header_image_url();
+ $url = kubrick_header_image_url() ;
$output .= "#header { background: url('$url') no-repeat bottom center; }\n";
}
if ( false !== ( $color = kubrick_header_color() ) ) {
@@ -13,7 +13,7 @@ function kubrick_head() {
if ( false !== ( $display = kubrick_header_display() ) ) {
$output .= "#headerimg { display: $display }\n";
}
- $foot = "</style>\n";
+ $foot = "--></style>\n";
if ( '' != $output )
echo $head . $output . $foot;
}
diff --git a/wp-inst/wp-content/themes/default/header.php b/wp-inst/wp-content/themes/default/header.php
index c7dcbb0..977daf0 100644
--- a/wp-inst/wp-content/themes/default/header.php
+++ b/wp-inst/wp-content/themes/default/header.php
@@ -9,9 +9,7 @@
<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
-<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
-<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
-<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
+<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
<style type="text/css" media="screen">
@@ -43,8 +41,6 @@
*/
</style>
-<?php wp_get_archives('type=monthly&format=link'); ?>
-
<?php wp_head(); ?>
</head>
<body>
diff --git a/wp-inst/wp-content/themes/default/index.php b/wp-inst/wp-content/themes/default/index.php
index 0e76687..32a432e 100644
--- a/wp-inst/wp-content/themes/default/index.php
+++ b/wp-inst/wp-content/themes/default/index.php
@@ -14,7 +14,7 @@
<?php the_content('Read the rest of this entry &raquo;'); ?>
</div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
diff --git a/wp-inst/wp-content/themes/default/search.php b/wp-inst/wp-content/themes/default/search.php
index 602a19d..d747870 100644
--- a/wp-inst/wp-content/themes/default/search.php
+++ b/wp-inst/wp-content/themes/default/search.php
@@ -17,12 +17,8 @@
<div class="post">
<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
<small><?php the_time('l, F jS, Y') ?></small>
-
- <div class="entry">
- <?php the_excerpt() ?>
- </div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
@@ -34,7 +30,7 @@
<?php else : ?>
- <h2 class="center">Not Found</h2>
+ <h2 class="center">No posts found. Try a different search?</h2>
<?php include (TEMPLATEPATH . '/searchform.php'); ?>
<?php endif; ?>
@@ -43,4 +39,4 @@
<?php get_sidebar(); ?>
-<?php get_footer(); ?> \ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-inst/wp-includes/default-filters.php b/wp-inst/wp-includes/default-filters.php
index 50c6eca..e6ec97b 100644
--- a/wp-inst/wp-includes/default-filters.php
+++ b/wp-inst/wp-includes/default-filters.php
@@ -83,5 +83,6 @@ add_filter('the_author', 'ent2ncr', 8);
// Actions
add_action('publish_post', 'generic_ping');
+add_action('wp_head', 'rsd_link');
?>
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index df336e3..85f1023 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -2066,14 +2066,8 @@ function status_header( $header ) {
elseif ( 410 == $header )
$text = 'Gone';
- if ( preg_match('/cgi/',php_sapi_name()) ) {
- @header("Status: $header $text");
- } else {
- if ( version_compare(phpversion(), '4.3.0', '>=') )
- @header($text, TRUE, $header);
- else
- @header("HTTP/1.x $header $text");
- }
+ @header("HTTP/1.1 $header $text");
+ @header("Status: $header $text");
}
function nocache_headers() {
diff --git a/wp-inst/wp-includes/pluggable-functions.php b/wp-inst/wp-includes/pluggable-functions.php
index 2e69c1f..e07ed36 100644
--- a/wp-inst/wp-includes/pluggable-functions.php
+++ b/wp-inst/wp-includes/pluggable-functions.php
@@ -245,8 +245,8 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
global $wpdb;
$comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
- $post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID='$comment->comment_post_ID' LIMIT 1");
- $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID='$post->post_author' LIMIT 1");
+ $post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$comment->comment_post_ID' LIMIT 1");
+ $user = get_userdata( $post->post_author );
if ('' == $user->user_email) return false; // If there's no email to send the comment to
diff --git a/wp-inst/wp-includes/template-functions-general.php b/wp-inst/wp-includes/template-functions-general.php
index 3c4fc3e..17d8aa1 100644
--- a/wp-inst/wp-includes/template-functions-general.php
+++ b/wp-inst/wp-includes/template-functions-general.php
@@ -653,4 +653,8 @@ function the_weekday_date($before='',$after='') {
echo $the_weekday_date;
}
+function rsd_link() {
+ echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_bloginfo('url') . "/xmlrpc.php?rsd\" />\n";
+}
+
?>
diff --git a/wp-inst/wp-includes/vars.php b/wp-inst/wp-includes/vars.php
index 96031a2..f61b969 100644
--- a/wp-inst/wp-includes/vars.php
+++ b/wp-inst/wp-includes/vars.php
@@ -37,6 +37,11 @@ $is_IE = (($is_macIE) || ($is_winIE));
$is_apache = ( strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') || strstr($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') ) ? 1 : 0;
$is_IIS = strstr($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') ? 1 : 0;
+// On OS X Server, $_SERVER['REMOTE_ADDR'] is the server's address. Workaround this
+// by using $_SERVER['HTTP_PC_REMOTE_ADDR'], which *is* the remote address.
+if ( isset($_SERVER['HTTP_PC_REMOTE_ADDR']) )
+ $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_PC_REMOTE_ADDR'];
+
// if the config file does not provide the smilies array, let's define it here
if (!isset($wpsmiliestrans)) {
$wpsmiliestrans = array(
diff --git a/wp-inst/xmlrpc.php b/wp-inst/xmlrpc.php
index 3c2e555..235c57b 100644
--- a/wp-inst/xmlrpc.php
+++ b/wp-inst/xmlrpc.php
@@ -4,6 +4,28 @@
$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
include('./wp-config.php');
+
+if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
+header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+
+?>
+<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
+ <service>
+ <engineName>WordPress</engineName>
+ <engineLink>http://wordpress.org/</engineLink>
+ <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
+ <apis>
+ <api name="Movable Type" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+ <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+ <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+ </apis>
+ </service>
+</rsd>
+<?php
+exit;
+}
+
include_once(ABSPATH . WPINC . '/class-IXR.php');
// Turn off all warnings and errors.
generated by cgit (git 2.34.1) at 2025-06-02 02:06:42 +0000