head 1.12; access; symbols OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE:1.3.0.2; locks; strict; comment @# @; 1.12 date 2008.08.06.07.29.23; author rse; state Exp; branches; next 1.11; commitid VKKAu72IzG5gmHdt; 1.11 date 2008.07.15.15.48.14; author rse; state Exp; branches; next 1.10; commitid PrQRa92OaatePUat; 1.10 date 2008.04.05.15.24.28; author rse; state Exp; branches; next 1.9; commitid EWBfRIFLbLImWVXs; 1.9 date 2008.03.29.21.23.38; author rse; state Exp; branches; next 1.8; commitid 5E2ZzQA7Vebx94Xs; 1.8 date 2007.12.30.11.59.07; author rse; state Exp; branches; next 1.7; commitid F7OGREZXf4geVrLs; 1.7 date 2007.10.01.11.41.56; author rse; state Exp; branches; next 1.6; commitid GV3pXKYZMd2HISzs; 1.6 date 2007.06.21.09.23.05; author rse; state Exp; branches; next 1.5; commitid 8NpD31eMhqhleLms; 1.5 date 2007.06.08.15.52.19; author rse; state Exp; branches; next 1.4; commitid c4rmCaDqesTLN7ls; 1.4 date 2007.05.17.08.28.45; author rse; state Exp; branches; next 1.3; commitid Ea7mBqqaLkGr3gis; 1.3 date 2007.02.14.10.41.24; author rse; state Exp; branches 1.3.2.1; next 1.2; commitid oiPDrn7wEuCiKr6s; 1.2 date 2007.02.13.12.49.51; author rse; state Exp; branches; next 1.1; commitid 4KtlK0yw7VFmuk6s; 1.1 date 2007.02.10.21.30.39; author rse; state Exp; branches; next ; commitid Rl5zWucDOq80tZ5s; 1.3.2.1 date 2007.02.14.10.41.24; author thl; state dead; branches; next 1.3.2.2; commitid j886gsownDQWXCas; 1.3.2.2 date 2007.03.18.23.33.36; author thl; state Exp; branches; next ; commitid j886gsownDQWXCas; desc @@ 1.12 log @modifying package: wordpress-2.6 20080802 -> 20080806 @ text @Index: wordpress/wp-includes/canonical.php --- wordpress/wp-includes/canonical.php.orig 2008-05-25 17:45:05 +0200 +++ wordpress/wp-includes/canonical.php 2008-08-06 09:26:50 +0200 @@@@ -144,6 +144,12 @@@@ if ( isset($user_home['host']) ) $redirect['host'] = $user_home['host']; + // SHAMELESS HACK TO MAKE WORDPRESS THINK IT IS RUNNING UNDER PORT 80 + // TO FIX THE URL TROUBLE WITH THE USUAL FRONTEND APACHE WEBSERVER! --rse + $user_home['port'] = 80; + $redirect['port'] = 80; + $original['port'] = 80; + // Handle ports if ( isset($user_home['port']) ) $redirect['port'] = $user_home['port']; Index: wordpress/wp-login.php --- wordpress/wp-login.php.orig 2008-07-11 22:14:44 +0200 +++ wordpress/wp-login.php 2008-08-06 09:26:50 +0200 @@@@ -138,7 +138,7 @@@@ $wpdb->query($wpdb->prepare("UPDATE $wpdb->users SET user_activation_key = %s WHERE user_login = %s", $key, $user_login)); } $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; - $message .= get_option('siteurl') . "\r\n\r\n"; + $message .= sprintf(__('Website: %s'), get_option('siteurl')) . "\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . "\r\n"; Index: wordpress/wp-mail.php --- wordpress/wp-mail.php.orig 2008-05-25 17:50:15 +0200 +++ wordpress/wp-mail.php 2008-08-06 09:26:50 +0200 @@@@ -143,6 +143,7 @@@@ // Author not found in DB, set status to pending. Author already set to admin. $post_status = 'pending'; } + $post_status = 'draft'; $subject = trim($subject); Index: wp-hashcash/wp-hashcash.php --- wp-hashcash/wp-hashcash.php.orig 2008-07-30 10:07:02 +0200 +++ wp-hashcash/wp-hashcash.php 2008-08-06 09:27:21 +0200 @@@@ -521,7 +521,6 @@@@ } echo '
'; - echo '

' . __('Powered by', 'wp-hashcash') . ' WP Hashcash

'; echo ''; } @ 1.11 log @upgrading package: wordpress 2.5.1 -> 2.6 @ text @d3 1 a3 1 +++ wordpress/wp-includes/canonical.php 2008-07-15 17:39:28 +0200 d19 1 a19 1 +++ wordpress/wp-login.php 2008-07-15 17:39:28 +0200 d31 1 a31 1 +++ wordpress/wp-mail.php 2008-07-15 17:39:28 +0200 d41 3 a43 3 --- wp-hashcash/wp-hashcash.php.orig 2008-03-29 20:07:10 +0100 +++ wp-hashcash/wp-hashcash.php 2008-07-15 17:39:28 +0200 @@@@ -448,8 +448,7 @@@@ d46 1 a46 1 echo ''; d48 1 a48 2 - echo ''; + echo ''; a50 1 add_action('comment_form', 'wphc_addform'); @ 1.10 log @add HashCash plugin @ text @d2 5 a6 5 --- wordpress/wp-includes/canonical.php.orig 2008-02-24 03:09:24 +0100 +++ wordpress/wp-includes/canonical.php 2008-04-05 17:21:55 +0200 @@@@ -139,6 +139,12 @@@@ $user_home = @@parse_url(get_option('home')); $redirect['host'] = $user_home['host']; d18 4 a21 4 --- wordpress/wp-login.php.orig 2008-03-26 08:43:52 +0100 +++ wordpress/wp-login.php 2008-04-05 17:21:55 +0200 @@@@ -99,7 +99,7 @@@@ $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); d28 1 a28 10 $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n"; @@@@ -129,7 +129,7 @@@@ wp_set_password($new_pass, $user->ID); $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n"; - $message .= get_option('siteurl') . "/wp-login.php\r\n"; + $message .= sprintf(__('Login: %s'), get_option('siteurl') . "/wp-login.php") . "\r\n"; if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) ) die('

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

'); d30 3 a32 3 --- wordpress/wp-mail.php.orig 2007-12-29 20:38:33 +0100 +++ wordpress/wp-mail.php 2008-04-05 17:21:55 +0200 @@@@ -133,6 +133,7 @@@@ d42 1 a42 1 +++ wp-hashcash/wp-hashcash.php 2008-04-05 17:23:06 +0200 @ 1.9 log @upgrading package: wordpress 2.3.3 -> 2.5 @ text @d3 1 a3 1 +++ wordpress/wp-includes/canonical.php 2008-03-29 22:17:27 +0100 d19 1 a19 1 +++ wordpress/wp-login.php 2008-03-29 22:18:53 +0100 d40 1 a40 1 +++ wordpress/wp-mail.php 2008-03-29 22:20:39 +0100 d49 13 @ 1.8 log @apply my shameless hack as one usually needs anyway @ text @d2 3 a4 3 --- wordpress/wp-includes/canonical.php.orig 2007-10-17 22:15:18 +0200 +++ wordpress/wp-includes/canonical.php 2007-12-30 12:55:12 +0100 @@@@ -108,6 +108,12 @@@@ d18 13 a30 13 --- wordpress/wp-login.php.orig 2007-09-26 01:17:30 +0200 +++ wordpress/wp-login.php 2007-12-30 12:52:53 +0100 @@@@ -115,7 +115,7 @@@@ // Now insert the new pass md5'd into the db $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; - $message .= get_option('siteurl') . "\r\n\r\n"; + $message .= sprintf(__('Website: %s'), get_option('siteurl')) . "\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n"; @@@@ -189,7 +189,7 @@@@ wp_cache_delete($user->user_login, 'userlogins'); d36 1 a36 1 if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) { d39 7 a45 4 --- wordpress/wp-mail.php.orig 2007-12-29 20:38:47 +0100 +++ wordpress/wp-mail.php 2007-12-30 12:52:53 +0100 @@@@ -142,7 +142,7 @@@@ $post_category = $post_categories; d47 1 a47 3 // or maybe we should leave the choice to email drafts? propose a way - $post_status = 'publish'; + $post_status = 'draft'; a48 2 $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status'); $post_data = add_magic_quotes($post_data); @ 1.7 log @finally upgrade to Wordpress 2.3 @ text @d1 16 d18 3 a20 3 --- wordpress/wp-login.php.orig 2007-09-19 00:23:16 +0200 +++ wordpress/wp-login.php 2007-09-25 07:35:56 +0200 @@@@ -113,7 +113,7 @@@@ d29 1 a29 1 @@@@ -187,7 +187,7 @@@@ d39 2 a40 2 --- wordpress/wp-mail.php.orig 2007-09-18 18:32:22 +0200 +++ wordpress/wp-mail.php 2007-09-25 07:35:56 +0200 @ 1.6 log @upgrading package: wordpress 2.2 -> 2.2.1 @ text @d1 4 a4 16 Index: wp-includes/formatting.php --- wp-includes/formatting.php.orig 2007-04-13 01:19:16 +0200 +++ wp-includes/formatting.php 2007-05-17 09:47:52 +0200 @@@@ -78,7 +78,7 @@@@ $pee = preg_replace('!(]*>)\s*
!', "$1", $pee); $pee = preg_replace('!
(\s*]*>)!', '$1', $pee); if (strpos($pee, ')(.*?)!ise', " stripslashes('$1') . stripslashes(clean_pre('$2')) . '' ", $pee); + $pee = preg_replace('!()(.*?)!ise', " wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '' ", $pee); $pee = preg_replace( "|\n

$|", '

', $pee ); return $pee; Index: wp-login.php --- wp-login.php.orig 2007-04-19 04:53:19 +0200 +++ wp-login.php 2007-05-17 09:20:19 +0200 @@@@ -114,7 +114,7 @@@@ d13 1 a13 1 @@@@ -188,7 +188,7 @@@@ d22 3 a24 3 Index: wp-mail.php --- wp-mail.php.orig 2007-05-05 04:51:20 +0200 +++ wp-mail.php 2007-05-17 09:20:19 +0200 @ 1.5 log @fix security bug @ text @a45 12 Index: xmlrpc.php --- xmlrpc.php.orig 2007-05-11 23:40:15 +0200 +++ xmlrpc.php 2007-06-08 16:07:27 +0200 @@@@ -538,7 +538,7 @@@@ $username = $args[1]; $password = $args[2]; $category = $args[3]; - $max_results = $args[4]; + $max_results = (int) $args[4]; if(!$this->login_pass_ok($username, $password)) { return($this->error); @ 1.4 log @upgrading package: wordpress 2.1.3 -> 2.2 @ text @d46 12 @ 1.3 log @mailed postings IMHO really should just 'draft' status (so they are not going online immediately) as they usually always have to be post-adjusted before publishing @ text @d2 3 a4 3 --- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100 +++ wp-includes/formatting.php 2007-02-14 11:32:46 +0100 @@@@ -80,7 +80,7 @@@@ d7 1 a7 1 if ( strstr( $pee, ')(.*?)!ise', " wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '' ", $pee); d11 1 a11 1 /**/ d14 2 a15 2 --- wp-login.php.orig 2006-12-21 11:10:04 +0100 +++ wp-login.php 2007-02-14 11:32:46 +0100 d35 3 a37 3 --- wp-mail.php.orig 2006-08-30 23:46:31 +0200 +++ wp-mail.php 2007-02-14 11:36:00 +0100 @@@@ -131,7 +131,7 @@@@ a45 7 @@@@ -161,4 +161,4 @@@@ $pop3->quit(); -?> \ No newline at end of file +?> @ 1.3.2.1 log @file wordpress.patch was added on branch OPENPKG_2_STABLE on 2007-03-18 23:33:36 +0000 @ text @d1 52 @ 1.3.2.2 log @MFC: make up leeway for 2_STABLE by virtue of build-time results @ text @a0 52 Index: wp-includes/formatting.php --- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100 +++ wp-includes/formatting.php 2007-02-14 11:32:46 +0100 @@@@ -80,7 +80,7 @@@@ $pee = preg_replace('!(]*>)\s*
!', "$1", $pee); $pee = preg_replace('!
(\s*]*>)!', '$1', $pee); if ( strstr( $pee, ')(.*?)!ise', " stripslashes('$1') . stripslashes(clean_pre('$2')) . '' ", $pee); + $pee = preg_replace('!()(.*?)!ise', " wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '' ", $pee); $pee = preg_replace( "|\n

$|", '

', $pee ); /**/ return $pee; Index: wp-login.php --- wp-login.php.orig 2006-12-21 11:10:04 +0100 +++ wp-login.php 2007-02-14 11:32:46 +0100 @@@@ -114,7 +114,7 @@@@ // Now insert the new pass md5'd into the db $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; - $message .= get_option('siteurl') . "\r\n\r\n"; + $message .= sprintf(__('Website: %s'), get_option('siteurl')) . "\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n"; @@@@ -188,7 +188,7 @@@@ wp_cache_delete($user->user_login, 'userlogins'); $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n"; - $message .= get_option('siteurl') . "/wp-login.php\r\n"; + $message .= sprintf(__('Login: %s'), get_option('siteurl') . "/wp-login.php") . "\r\n"; if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) { die('

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

'); Index: wp-mail.php --- wp-mail.php.orig 2006-08-30 23:46:31 +0200 +++ wp-mail.php 2007-02-14 11:36:00 +0100 @@@@ -131,7 +131,7 @@@@ $post_category = $post_categories; // or maybe we should leave the choice to email drafts? propose a way - $post_status = 'publish'; + $post_status = 'draft'; $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status'); $post_data = add_magic_quotes($post_data); @@@@ -161,4 +161,4 @@@@ $pop3->quit(); -?> \ No newline at end of file +?> @ 1.2 log @do not strip all backslashes, only those introduced by preg_replace -- without this all code fragments with backslashes are garbled @ text @d3 1 a3 1 +++ wp-includes/formatting.php 2007-02-13 13:48:07 +0100 d15 1 a15 1 +++ wp-login.php 2007-02-13 13:47:46 +0100 d34 19 @ 1.1 log @little bit of cosmetics to the sent mails @ text @d1 12 d15 1 a15 1 +++ wp-login.php 2007-02-10 22:29:05 +0100 @