wordpress.patch 3.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. Index: wordpress/wp-includes/canonical.php
  2. --- wordpress/wp-includes/canonical.php.orig 2008-02-24 03:09:24 +0100
  3. +++ wordpress/wp-includes/canonical.php 2008-04-05 17:21:55 +0200
  4. @@ -139,6 +139,12 @@
  5. $user_home = @parse_url(get_option('home'));
  6. $redirect['host'] = $user_home['host'];
  7. + // SHAMELESS HACK TO MAKE WORDPRESS THINK IT IS RUNNING UNDER PORT 80
  8. + // TO FIX THE URL TROUBLE WITH THE USUAL FRONTEND APACHE WEBSERVER! --rse
  9. + $user_home['port'] = 80;
  10. + $redirect['port'] = 80;
  11. + $original['port'] = 80;
  12. +
  13. // Handle ports
  14. if ( isset($user_home['port']) )
  15. $redirect['port'] = $user_home['port'];
  16. Index: wordpress/wp-login.php
  17. --- wordpress/wp-login.php.orig 2008-03-26 08:43:52 +0100
  18. +++ wordpress/wp-login.php 2008-04-05 17:21:55 +0200
  19. @@ -99,7 +99,7 @@
  20. $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
  21. }
  22. $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
  23. - $message .= get_option('siteurl') . "\r\n\r\n";
  24. + $message .= sprintf(__('Website: %s'), get_option('siteurl')) . "\r\n";
  25. $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
  26. $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
  27. $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
  28. @@ -129,7 +129,7 @@
  29. wp_set_password($new_pass, $user->ID);
  30. $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
  31. $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
  32. - $message .= get_option('siteurl') . "/wp-login.php\r\n";
  33. + $message .= sprintf(__('Login: %s'), get_option('siteurl') . "/wp-login.php") . "\r\n";
  34. if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) )
  35. die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
  36. Index: wordpress/wp-mail.php
  37. --- wordpress/wp-mail.php.orig 2007-12-29 20:38:33 +0100
  38. +++ wordpress/wp-mail.php 2008-04-05 17:21:55 +0200
  39. @@ -133,6 +133,7 @@
  40. // Author not found in DB, set status to pending. Author already set to admin.
  41. $post_status = 'pending';
  42. }
  43. + $post_status = 'draft';
  44. $subject = trim($subject);
  45. Index: wp-hashcash/wp-hashcash.php
  46. --- wp-hashcash/wp-hashcash.php.orig 2008-03-29 20:07:10 +0100
  47. +++ wp-hashcash/wp-hashcash.php 2008-04-05 17:23:06 +0200
  48. @@ -448,8 +448,7 @@
  49. }
  50. echo '<input type="hidden" id="wphc_value" name="wphc_value" value=""/>';
  51. - echo '<p>' . __('Powered by', 'wp-hashcash') . ' <a href="http://wordpress-plugins.feifei.us/hashcash/">WP Hashcash</a></p>';
  52. - echo '<noscript><small>Wordpress Hashcash needs javascript to work, but your browser has javascript disabled. Your comment will be '.$verb.'!</small></noscript>';
  53. + echo '<noscript><small>Wordpress Hashcash needs JavaScript to work, but your browser has JavaScript disabled. Your comment will be '.$verb.'!</small></noscript>';
  54. }
  55. add_action('comment_form', 'wphc_addform');