diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-23 00:46:53 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-23 00:46:53 +0000 |
| commit | 645c224ff74d9727b2da6dbcd03d9b05d1035c5d (patch) | |
| tree | 5e499f01538d946226b77ecfa4c473a1d25cf398 | |
| parent | 66a9b8605f3d0ac8e655ca8fbb241e1f5b534117 (diff) | |
Backport of bugfix for bug #1064 from SVN r2188, original patch from DukePyrolator, fixes NS RECOVER so it doesn't display "(null)" in some places.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2189 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | src/core/ns_recover.c | 8 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index b86774d03..0ddd339b3 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -124,9 +124,15 @@ int do_recover(User * u) } else { if (group_identified(u, na->nc) || (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) { + char relstr[192]; + notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW); collide(na, 0); - notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick); + + /* Convert NSReleaseTimeout second to string format */ + duration(u2->na, relstr, sizeof(relstr), NSReleaseTimeout); + + notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr); } else { notice_lang(s_NickServ, u, ACCESS_DENIED); } diff --git a/version.log b/version.log index e57a9bbb5..3cfe77525 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="0" VERSION_EXTRA="-svn" -VERSION_BUILD="2187" +VERSION_BUILD="2189" # $Log$ # Changes since 1.8.0 Release +#Revision 2189 - Backport of bugfix for bug #1064 from SVN r2188, original patch from DukePyrolator, fixes NS RECOVER so it doesn't display "(null)" in some places. #Revision 2187 - Backport of bugfix for bug #1062 from SVN r2185 and 2186, patch from Adam, BS ASSIGN, BS ACT, and BS SAY should no longer send revealing error messages to users without access. #Revision 2182 - Fix memleak in channels.c from DukePyrolator. (Same fix applied to 1.9 earlier). Thanks DP! #Revision 2181 - Backport of bugfix for bug #1043 from SVN r2178, patch from Adam, CS LIST will no longer show suspended channels to normal users. |