summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-09-18 14:50:57 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-09-18 14:50:57 +0000
commit717e1a1d58ec09078f2fd487cb9daa0b5075e44b (patch)
tree95a8177a13f40d718167fb9a8dbb06cfa8f62f6e /src
parent05879f80d99a8beb0afec70ed13055c681c3c400 (diff)
BUILD : 1.7.11 (890) BUGS : NOTES : Fixed common_get_vhost/vident to also return vhost/vident on ircds without usermode for vhost/vident
git-svn-id: svn://svn.anope.org/anope/trunk@890 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@637 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/actions.c4
-rw-r--r--src/core/ns_info.c1
2 files changed, 4 insertions, 1 deletions
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,