BUILD : 1.7.6 (511) BUGS : NOTES : Rollback to 507

git-svn-id: svn://svn.anope.org/anope/trunk@511 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@365 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 6 insertions, 39 deletions

diff --git a/Changes b/Changes
index a551a627f..f25b68161 100644
--- a/Changes
+++ b/Changes
@@ -70,8 +70,6 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 
 Provided by DrStein <gacevedo@anope.org> - 2004
 12/23 A NS STATUS will return your status if no nickname is given.        [ #00]
-12/30 F mod_current_module_name is not set if the module uses addCommand. [#261]
-12/30 F Loop overpassed in moduleDelData.                                 [#261]
 12/26 F Error message during SQL init even if UseRDB was disabled.        [ #00]
 12/10 F Extra tab in language files, causing bad answer in !seen.         [#243]
 11/28 F Fixes RSEND oddity.                                               [#237]
diff --git a/src/commands.c b/src/commands.c
index cf9509497..e37eb574b 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -69,29 +69,6 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[],
                  const char *cmd)
 {
     Command *c = findCommand(cmdTable, cmd);
-
-    if (c) {
-        if (cmdTable == HOSTSERV) {
-            c->mod_name = NULL;
-        } else if (cmdTable == BOTSERV) {
-            c->mod_name = NULL;
-        } else if (cmdTable == MEMOSERV) {
-            c->mod_name = NULL;
-        } else if (cmdTable == CHANSERV) {
-            c->mod_name = NULL;
-        } else if (cmdTable == NICKSERV) {
-            c->mod_name = NULL;
-        } else if (cmdTable == HELPSERV) {
-            c->mod_name = NULL;
-        } else if (cmdTable == OPERSERV) {
-            c->mod_name = NULL;
-        } else {
-            c->mod_name = sstrdup(mod_current_module_name);
-            if (debug)
-                alog("Module %s is using addCommand instead of moduleAddCommand.", c->mod_name);
-        }
-    }
-
     do_run_cmd(service, u, c, cmd);
 }
 
diff --git a/src/modules.c b/src/modules.c
index eace42ae7..107cf0bfa 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1887,6 +1887,7 @@ void moduleDelData(ModuleData **md, char *key)
     
     if(key) { 
     	while(current) {
+		next = current->next;
 		if((stricmp(current->moduleName,mod_name)==0) && (stricmp(current->key,key)==0)) {	
 			if(prev) {
 				prev->next  = current->next;
@@ -1900,7 +1901,6 @@ void moduleDelData(ModuleData **md, char *key)
 			free(current);
 		}
 		prev = current;
-		next = current->next;
 		current = next;
     	}
     }
@@ -1921,6 +1921,7 @@ void moduleDelAllData(ModuleData **md)
     ModuleData *next = NULL;
      
     while(current) {
+	next = current->next;
 	if((stricmp(current->moduleName,mod_name)==0)) {	
 		if(prev) {
 			prev->next  = current->next;
@@ -1934,7 +1935,6 @@ void moduleDelAllData(ModuleData **md)
 		free(current);
 	}
 	prev = current;
-	next = current->next;
 	current = next;
     }
     free(mod_name);
diff --git a/version.log b/version.log
index 4ed659b13..3ff3b293e 100644
--- a/version.log
+++ b/version.log
@@ -8,21 +8,13 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="6"
-VERSION_BUILD="510"
+VERSION_BUILD="511"
 
 # $Log$
 #
-# BUILD : 1.7.6 (510)
-# BUGS  : N/A
-# NOTES : Clean up after the last commit
-#
-# BUILD : 1.7.6 (509)
-# BUGS  : 261
-# NOTES : Doc found more to the bug 261, should to be the last
-#
-# BUILD : 1.7.6 (508)
-# BUGS  : 261
-# NOTES : docs fix to bug 261, seems to fix it for me, Certus care to test?
+# BUILD : 1.7.6 (511)
+# BUGS  : 
+# NOTES : Rollback to 507
 #
 # BUILD : 1.7.6 (507)
 # BUGS  : N/A