And another tiny one

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

diff --git a/src/xline.cpp b/src/xline.cpp
index a77f7dc0b93e60729036b6ad065581c43cf59aad..20df92dd0003503989ceed3997ff7210eb21abc4 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -289,19 +289,21 @@ XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pat
 // removes lines that have expired
 void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 {
-               item->second->DisplayExpiry();
-               item->second->Unset();
+       FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
 
-               /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
-                * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
-                * -- Brain
-                */
-               std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
-               if (pptr != pending_lines.end())
-                       pending_lines.erase(pptr);
+       item->second->DisplayExpiry();
+       item->second->Unset();
 
-               delete item->second;
-               container->second.erase(item);
+       /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
+        * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
+        * -- Brain
+        */
+       std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
+       if (pptr != pending_lines.end())
+               pending_lines.erase(pptr);
+
+       delete item->second;
+       container->second.erase(item);
 }