OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Feb-2007 22:30:40
Branch: HEAD Handle: 2007021021303900
Added files:
openpkg-src/wordpress wordpress.patch
Modified files:
openpkg-src/wordpress wordpress.spec
Log:
little bit of cosmetics to the sent mails
Summary:
Revision Changes Path
1.1 +21 -0 openpkg-src/wordpress/wordpress.patch
1.24 +2 -0 openpkg-src/wordpress/wordpress.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
============================================================================
$ cvs diff -u -r0 -r1.1 wordpress.patch
--- /dev/null 2007-02-10 22:30:14 +0100
+++ wordpress.patch 2007-02-10 22:30:40 +0100
@@ -0,0 +1,21 @@
+Index: wp-login.php
+--- wp-login.php.orig 2006-12-21 11:10:04 +0100
++++ wp-login.php 2007-02-10 22:29:05 +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('<p>' . __('The e-mail could not be sent.') . "<br />\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'</p>');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 10 Feb 2007 19:17:35 -0000
1.23
+++ openpkg-src/wordpress/wordpress.spec 10 Feb 2007 21:30:39 -0000
1.24
@@ -40,6 +40,7 @@
Source1: wordpress-apache.conf
Source2: wordpress-setup.sh
Source3: rc.wordpress
+Patch0: wordpress.patch
# build information
Prefix: %{l_prefix}
@@ -68,6 +69,7 @@
%prep
%setup -q -n wordpress
+ %patch -p0
%build
# create configuration file
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
