1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [234] merge rev 101 from trunk
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B234%5D%20merge%20rev%20101%20from%20trunk&In-Reply-To=%3C20110106201737.21A9C41AA2%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="001622.html">
<LINK REL="Next" HREF="001624.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [234] merge rev 101 from trunk</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B234%5D%20merge%20rev%20101%20from%20trunk&In-Reply-To=%3C20110106201737.21A9C41AA2%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [234] merge rev 101 from trunk">root at mageia.org
</A><BR>
<I>Thu Jan 6 21:17:37 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="001622.html">[Mageia-sysadm] [233] merge from trunk, rev 97
</A></li>
<LI>Next message: <A HREF="001624.html">[Mageia-sysadm] [235] revert part of commit r115, to syc with trunk
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1623">[ date ]</a>
<a href="thread.html#1623">[ thread ]</a>
<a href="subject.html#1623">[ subject ]</a>
<a href="author.html#1623">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 234
Author: misc
Date: 2011-01-06 21:17:36 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
merge rev 101 from trunk
Modified Paths:
--------------
identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm
Modified: identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm
===================================================================
--- identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm 2011-01-06 20:06:41 UTC (rev 233)
+++ identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm 2011-01-06 20:17:36 UTC (rev 234)
@@ -536,7 +536,7 @@
if ( @{ $c->error } ) {
my $errors = join "\n",@{ $c->error };
$c->log->info("Sending reset mail to $email failed: $errors");
- $c->response->body($c->loc('An error occured sending the email, but your account was created. Please try the password recovery process f you entered the correct email address: [_1]', $errors));
+ $c->response->body($c->loc('An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: [_1]', $errors));
$c->error(0); # Reset the error condition if you need to
}
push @errors,$c->loc('Password reset and email sent');
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/3589acc9/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001622.html">[Mageia-sysadm] [233] merge from trunk, rev 97
</A></li>
<LI>Next message: <A HREF="001624.html">[Mageia-sysadm] [235] revert part of commit r115, to syc with trunk
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1623">[ date ]</a>
<a href="thread.html#1623">[ thread ]</a>
<a href="subject.html#1623">[ subject ]</a>
<a href="author.html#1623">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
