Remove bad check for channel op in m_auditorium, fixes bug #886

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index c92643bcd21d85e66030a3d6998ae467beb39466..a57f604c515df05cf3566d242053419c9f2ae1f2 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -167,17 +167,17 @@ bool XLineManager::AddLine(XLine* line, User* user)
 {
        ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
 
-       /* If the line exists, check if its an expired line */
+       if (line->duration && ServerInstance->Time() > line->expiry)
+               return false; // Don't apply expired XLines.
+
+       /* Don't apply duplicate xlines */
        ContainerIter x = lookup_lines.find(line->type);
        if (x != lookup_lines.end())
        {
                LookupIter i = x->second.find(line->Displayable());
                if (i != x->second.end())
                {
-                       if (i->second->duration && ServerInstance->Time() > i->second->expiry)
-                               ExpireLine(x, i);
-                       else
-                               return false;
+                       return false;
                }
        }