summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes7
-rw-r--r--src/actions.c4
-rw-r--r--src/core/ns_info.c1
-rw-r--r--version.log6
4 files changed, 13 insertions, 5 deletions
diff --git a/Changes b/Changes
index 205ed9610..7951599db 100644
--- a/Changes
+++ b/Changes
@@ -8,9 +8,10 @@ Provided by Anope Dev. <dev@anope.org> - 2005
07/01 A Events for channel access/xop updates. [ #00]
06/26 A New module pack module: hs_request. [ #00]
06/03 A Protocol files can now fill mod_current_buffer with custom code. [#389]
-14/09 F Various issues with handling the version identifiers. [ #00]
-13/09 F make strict/profile now work for core and protocol files. [ #00]
-13/09 F Unused variables removed from modules.c. [ #00]
+09/18 F Last host was not always correctly set to a vHost if applied. [ #00]
+09/14 F Various issues with handling the version identifiers. [ #00]
+09/13 F make strict/profile now work for core and protocol files. [ #00]
+09/13 F Unused variables removed from modules.c. [ #00]
09/11 F Disallow botnicks longer than the net's max nick length. [ #00]
09/09 F Giving some more error output when opening a database fails. [ #00]
09/04 F Protocol module for plexus called wrong UNSGLINE function. [ #00]
diff --git a/src/actions.c b/src/actions.c
index 5ced638c6..e9c70ae52 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -212,6 +212,8 @@ char *common_get_vhost(User * u)
if (ircd->vhostmode && (u->mode & ircd->vhostmode))
return u->vhost;
+ else if (ircd->vhost && u->vhost)
+ return u->vhost;
else
return u->host;
}
@@ -231,6 +233,8 @@ char *common_get_vident(User * u)
if (ircd->vhostmode && (u->mode & ircd->vhostmode))
return u->vident;
+ else if (ircd->vident && u->vident)
+ return u->vident;
else
return u->username;
}
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index bb4c613ac..5037dd1c7 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -161,7 +161,6 @@ int do_info(User * u)
}
-
if (nick_online) {
if (show_hidden || !(na->nc->flags & NI_HIDE_MASK))
notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE,
diff --git a/version.log b/version.log
index 2d81678ad..00815b8dc 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="11"
VERSION_EXTRA="-rc2"
-VERSION_BUILD="889"
+VERSION_BUILD="890"
# $Log$
#
+# BUILD : 1.7.11 (890)
+# BUGS :
+# NOTES : Fixed common_get_vhost/vident to also return vhost/vident on ircds without usermode for vhost/vident
+#
# BUILD : 1.7.11 (889)
# BUGS :
# NOTES : Applied patches by Trystan to: (1) Fix memleak when AddAkiller was enabled (2) Fix MySQL detection on win32 with install.vbs (3) Remove color codes from tools on win32