<?php bloginfo('name'); ?><?php wp

diff -urN wordpress/index.php wordpress-patched/index.php --- wordpress/index.php 2004-04-28 02:26:49.000000000 -0500 +++ wordpress-patched/index.php 2004-06-04 12:37:44.972666047 -0500 @@ -1,4 +1,4 @@ - @@ -7,19 +7,19 @@ <?php bloginfo('name'); ?><?php wp_title(); ?> - + - + - + @@ -34,25 +34,25 @@ ',''); ?> - +

— @

- +

- + - +

@@ -72,7 +72,7 @@

- +

@@ -112,3 +112,4 @@

WordPress"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform")); ?>

+ diff -urN wordpress/wp-admin/categories.php wordpress-patched/wp-admin/categories.php --- wordpress/wp-admin/categories.php 2004-05-18 10:24:23.000000000 -0500 +++ wordpress-patched/wp-admin/categories.php 2004-06-04 12:57:10.585066836 -0500 @@ -42,17 +42,17 @@ $standalone = 1; require_once('admin-header.php'); - + if ($user_level < 3) die (__('Cheatin’ uh?')); - + $cat_name= addslashes(stripslashes(stripslashes($_POST['cat_name']))); $category_nicename = sanitize_title($cat_name); $category_description = addslashes(stripslashes(stripslashes($_POST['category_description']))); $cat = intval($_POST['cat']); $wpdb->query("INSERT INTO $tablecategories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$cat')"); - + header('Location: categories.php?message=1#addcat'); break; @@ -123,14 +123,14 @@ if ($user_level < 3) die (__('Cheatin’ uh?')); - + $cat_name = $wpdb->escape(stripslashes($_POST['cat_name'])); $cat_ID = (int) $_POST['cat_ID']; $category_nicename = sanitize_title($cat_name); $category_description = $wpdb->escape(stripslashes($_POST['category_description'])); $wpdb->query("UPDATE $tablecategories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$cat' WHERE cat_ID = '$cat_ID'"); - + header('Location: categories.php?message=3'); break; @@ -177,13 +177,13 @@

- +

diff -urN wordpress/wp-blog-header.php wordpress-patched/wp-blog-header.php --- wordpress/wp-blog-header.php 2004-05-21 17:33:47.000000000 -0500 +++ wordpress-patched/wp-blog-header.php 2004-06-04 12:36:49.936769596 -0500 @@ -1,11 +1,11 @@ wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file."); -require_once(dirname(__FILE__).'/' . '/wp-config.php'); +require_once('./wp-config.php'); -require_once(dirname(__FILE__).'/' . 'wp-includes/wp-l10n.php'); +require_once('wp-includes/wp-l10n.php'); // Process PATH_INFO, if set. $path_info = array(); @@ -46,7 +46,7 @@ parse_str($query, $path_info); } } - } + } } $wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name'); @@ -236,7 +236,7 @@ $cache_categories[$catt->cat_ID] = $catt; } -if ((empty($cat)) || ($cat == 'all') || ($cat == '0') || +if ((empty($cat)) || ($cat == 'all') || ($cat == '0') || // Bypass cat checks if fetching specific posts ( intval($year) || intval($monthnum) || intval($day) || intval($w) || @@ -474,7 +474,7 @@ ID, category_id, cat_name, category_nicename, category_description, category_parent FROM $tablecategories, $tablepost2cat, $tableposts WHERE category_id = cat_ID AND post_id = ID AND post_id IN ($post_id_list)"); - + foreach ($dogs as $catt) { $category_cache[$catt->ID][] = $catt; } @@ -485,7 +485,7 @@ LEFT JOIN $tablecomments ON ( comment_post_ID = ID AND comment_approved = '1') WHERE post_status = 'publish' AND ID IN ($post_id_list) GROUP BY ID"); - + if ($comment_counts) { foreach ($comment_counts as $comment_count) { $comment_count_cache["$comment_count->ID"] = $comment_count->ccount; @@ -494,25 +494,25 @@ // Get post-meta info if ( $meta_list = $wpdb->get_results(" - SELECT post_id,meta_key,meta_value - FROM $tablepostmeta + SELECT post_id,meta_key,meta_value + FROM $tablepostmeta WHERE post_id IN($post_id_list) ORDER BY post_id,meta_key ", ARRAY_A) ) { - + // Change from flat structure to hierarchical: $post_meta_cache = array(); foreach ($meta_list as $metarow) { $mpid = $metarow['post_id']; $mkey = $metarow['meta_key']; $mval = $metarow['meta_value']; - + // Force subkeys to be array type: if (!isset($post_meta_cache[$mpid]) || !is_array($post_meta_cache[$mpid])) $post_meta_cache[$mpid] = array(); if (!isset($post_meta_cache[$mpid]["$mkey"]) || !is_array($post_meta_cache[$mpid]["$mkey"])) $post_meta_cache[$mpid]["$mkey"] = array(); - + // Add a value to the current pid/key: $post_meta_cache[$mpid][$mkey][] = $mval; } diff -urN wordpress/wp-comments-post.php wordpress-patched/wp-comments-post.php --- wordpress/wp-comments-post.php 2004-05-07 18:21:26.000000000 -0500 +++ wordpress-patched/wp-comments-post.php 2004-06-04 12:36:31.541478140 -0500 @@ -1,5 +1,5 @@ $v) { @@ -10,7 +10,7 @@ } } return $array; -} +} if (!get_magic_quotes_gpc()) { $_POST = add_magic_quotes($_POST); @@ -68,9 +68,9 @@ $approved = 0; } -$wpdb->query("INSERT INTO $tablecomments -(comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved) -VALUES +$wpdb->query("INSERT INTO $tablecomments +(comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved) +VALUES ('$comment_post_ID', '$author', '$email', '$url', '$user_ip', '$now', '$now_gmt', '$comment', '$approved') "); @@ -101,4 +101,4 @@ header("Location: $location"); } -?> \ No newline at end of file +?> diff -urN wordpress/wp-content/plugins/markdown.php wordpress-patched/wp-content/plugins/markdown.php --- wordpress/wp-content/plugins/markdown.php 2004-04-19 03:58:36.000000000 -0500 +++ wordpress-patched/wp-content/plugins/markdown.php 2004-06-04 13:00:12.047104728 -0500 @@ -6,7 +6,7 @@ Version: 1.0b4 Author: John Gruber Author URI: http://daringfireball.net/ -*/ +*/ /* @@ -18,7 +18,7 @@ $g_empty_element_suffix = " />"; # Change to ">" for HTML output $g_tab_width = 4; $g_nested_brackets_depth = 6; -$g_nested_brackets = +$g_nested_brackets = str_repeat('(?>[^\[\]]+|\[', $g_nested_brackets_depth). str_repeat('\])*', $g_nested_brackets_depth); $g_escape_table = array( @@ -133,7 +133,7 @@ [ \t]* <(hr) # start tag = $2 \b # word break - ([^<>])*? # + ([^<>])*? # /?> # the matching end tag (?=\n{2,}|\Z) # followed by a blank line or end of document ) @@ -153,14 +153,14 @@ function _RunBlockGamut($text) { global $g_empty_element_suffix; - + $text = _DoHeaders($text); $text = preg_replace( array('/^( ?\* ?){3,}$/m', '/^( ?- ?){3,}$/m'), - array("\n" . $codeblock . "\n\n\n"; return $result; @@ -578,11 +578,11 @@ $_ = str_replace('&', '&', $_); # Do the angle bracket song and dance: - $_ = str_replace(array('<', '>'), + $_ = str_replace(array('<', '>'), array('<', '>'), $_); # Now, escape characters that are magic in Markdown: - $_ = str_replace(array_keys($g_escape_table), + $_ = str_replace(array_keys($g_escape_table), array_values($g_escape_table), $_); return $_; @@ -618,10 +618,10 @@ } function _DoBlockQuotes_callback($matches) { $bq = $matches[1]; - $bq = preg_replace('/^[ \t]*>[ \t]?/m', '', $bq); + $bq = preg_replace('/^[ \t]*>[ \t]?/m', '', $bq); $bq = _RunBlockGamut($bq); # recurse $bq = preg_replace('/^/m', "\t", $bq); - + return "

\n$bq\n

\n\n"; } @@ -657,7 +657,7 @@ function _EncodeAmpsAndAngles($text) { - $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w{1,8});)/', + $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w{1,8});)/', '&', $text);; # Encode naked <'s @@ -676,9 +676,9 @@ function _DoAutoLinks($text) { - $text = preg_replace("!<((https?|ftp):[^'\">\\s]+)>!", + $text = preg_replace("!<((https?|ftp):[^'\">\\s]+)>!", '\1', $text); - + # Email addresses: $text = preg_replace('{ < @@ -691,7 +691,7 @@ }exi', "_EncodeEmailAddress(_UnescapeSpecialChars(_UnslashQuotes('\\1')))", $text); - + return $text; } @@ -700,7 +700,7 @@ $addr = "mailto:" . $addr; $length = strlen($addr); - $addr = preg_replace_callback('/([^\:])/', + $addr = preg_replace_callback('/([^\:])/', '_EncodeEmailAddress_callback', $addr); $addr = "$addr"; @@ -719,7 +719,7 @@ function _UnescapeSpecialChars($text) { global $g_escape_table; - return str_replace(array_values($g_escape_table), + return str_replace(array_values($g_escape_table), array_keys($g_escape_table), $text); } @@ -735,8 +735,8 @@ $match = "(?s:)|". # comment "(?s:<\?.*?\?>)|". # processing instruction "$nested_tags"; # nested tags - - preg_match_all("/($match)/", $str, $matches, + + preg_match_all("/($match)/", $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE); foreach ($matches as $element) { @@ -744,15 +744,15 @@ $tag_start = $element[0][1]; $sec_start = $tag_start + strlen($whole_tag); if ($pos < $tag_start) { - array_push($tokens, array('text', + array_push($tokens, array('text', substr($str, $pos, $tag_start - $pos))); } array_push($tokens, array('tag', $whole_tag)); $pos = $sec_start; } - + if ($pos < $len) - array_push($tokens, array('text', + array_push($tokens, array('text', substr($str, $pos, $len - $pos))); return $tokens; } diff -urN wordpress/wp-includes/links-update-xml.php wordpress-patched/wp-includes/links-update-xml.php --- wordpress/wp-includes/links-update-xml.php 2004-05-05 01:44:59.000000000 -0500 +++ wordpress-patched/wp-includes/links-update-xml.php 2004-06-04 12:01:29.801235682 -0500 @@ -3,7 +3,7 @@ // Copyright (C) 2003 Mike Little -- mike@zed1.com // Get the path of our parent directory: -$parentpath = dirname(dirname(__FILE__)); +$parentpath = "../"; require_once($parentpath.'/wp-config.php'); @@ -171,4 +171,4 @@ //echo(''); } // end if updated cache file -?> \ No newline at end of file +?> diff -urN wordpress/wp-login.php wordpress-patched/wp-login.php --- wordpress/wp-login.php 2004-05-17 20:29:29.000000000 -0500 +++ wordpress-patched/wp-login.php 2004-06-05 07:45:18.802926122 -0500 @@ -1,5 +1,5 @@ user_level) { $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php'; } @@ -87,7 +87,7 @@ } $query = "SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND user_pass = '$password'"; - + $login = $wpdb->get_row($query); if (!$login) { @@ -201,7 +201,7 @@ $user_login = $_POST["user_login"]; $user_data = get_userdatabylogin($user_login); // redefining user_login ensures we return the right case in the email - $user_login = $user_data['user_login']; + $user_login = $user_data->user_login; $user_email = $user_data->user_email; if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or email address? Try again.'), 'wp-login.php?action=lostpassword')); @@ -213,7 +213,7 @@ $message .= "Password: $user_pass\r\n"; $message .= 'Login at: ' . get_settings('siteurl') . '/wp-login.php'; - $m = mail($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message); + $m = mail($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message, 'From: ' .get_settings('blogname'). ' WordPress Admin <' .get_settings('admin_email'). '>'); if ($m == false) { echo "

The email could not be sent.
\n"; @@ -223,7 +223,7 @@ echo "

The email was sent successfully to $user_login's email address.
Click here to login!

"; // send a copy of password change notification to the admin - mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login"); + mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login", 'From: ' .get_settings('blogname'). ' WordPress <' .get_settings('admin_email'). '>'); die(); } @@ -247,7 +247,7 @@ } else { return true; } - } + } if ( !(checklogin()) ) { if (!empty($_COOKIE['wordpressuser_'.$cookiehash])) { diff -urN wordpress/wp-mail.php wordpress-patched/wp-mail.php --- wordpress/wp-mail.php 2004-05-19 00:43:32.000000000 -0500 +++ wordpress-patched/wp-mail.php 2004-06-04 12:01:29.844220870 -0500 @@ -1,7 +1,7 @@ quit(); -?> \ No newline at end of file +?> diff -urN wordpress/wp-pass.php wordpress-patched/wp-pass.php --- wordpress/wp-pass.php 2004-04-20 17:56:36.000000000 -0500 +++ wordpress-patched/wp-pass.php 2004-06-04 12:36:04.570449385 -0500 @@ -4,7 +4,7 @@ It doesn't need to connect to the DB, or do anything fancy at all. Yum. -- Matt */ -require(dirname(__FILE__) . '/wp-config.php'); +require('./wp-config.php'); setcookie('wp-postpass_'.$cookiehash, $_POST['post_password'], time()+60*60*24*30); header('Location: ' . $_SERVER['HTTP_REFERER']); diff -urN wordpress/wp-rdf.php wordpress-patched/wp-rdf.php --- wordpress/wp-rdf.php 2004-05-19 05:24:25.000000000 -0500 +++ wordpress-patched/wp-rdf.php 2004-06-04 12:35:23.068560172 -0500 @@ -2,7 +2,7 @@ if (! $feed) { $blog = 1; // enter your blog's ID $doing_rss = 1; - require('wp-blog-header.php'); + require('./wp-blog-header.php'); } $more = 1; @@ -51,7 +51,7 @@ ]]> - + \ No newline at end of file diff -urN wordpress/wp-rss.php wordpress-patched/wp-rss.php --- wordpress/wp-rss.php 2004-05-21 17:32:58.000000000 -0500 +++ wordpress-patched/wp-rss.php 2004-06-04 12:30:29.428796031 -0500 @@ -3,7 +3,7 @@ if (! $feed) { $blog = 1; // enter your blog's ID $doing_rss = 1; - require('wp-blog-header.php'); + require('./wp-blog-header.php'); } header('Content-type: text/xml', true); @@ -26,7 +26,7 @@ // we might use this in the future, but not now, that's why it's commented in PHP // so that it doesn't appear at all in the RSS // echo ""; the_category_unicode(); echo ""; -$more = 1; +$more = 1; if (get_settings('rss_use_excerpt')) { ?> diff -urN wordpress/wp-rss2.php wordpress-patched/wp-rss2.php --- wordpress/wp-rss2.php 2004-05-22 00:06:00.000000000 -0500 +++ wordpress-patched/wp-rss2.php 2004-06-04 12:30:03.218655242 -0500 @@ -1,8 +1,8 @@ -'; ?> - diff -urN wordpress/wp-trackback.php wordpress-patched/wp-trackback.php --- wordpress/wp-trackback.php 2004-04-24 16:52:24.000000000 -0500 +++ wordpress-patched/wp-trackback.php 2004-06-04 12:01:36.077073146 -0500 @@ -1,5 +1,5 @@ \ No newline at end of file +?>