Version 5.0.0 beta 2

system/Member/Member.php

@@ -5516,7 +5516,8 @@ class Member extends ActiveRecord
 	{
 		if ( $this->member_id )
 		{
-			if ( $by === NULL and Dispatcher::hasInstance() )
+			/* Set this only if this was not called by the task system, otherwise we'll set the member who triggered the task as moderator   */
+			if ( Dispatcher::hasInstance() and !Dispatcher::i()->inDestructor and $by === NULL  )
 			{
 				$by = Session::i()->member; // Not \IPS\Member::loggedIn() because if this is an admin logged in as a member, we want to log that the action was done by the admin
 			}
@@ -6652,9 +6653,12 @@ class Member extends ActiveRecord
 		/* PMs are treated extra */
 		Db::i()->update( 'core_message_posts', array( 'msg_ip_address' => '' ), array( "msg_ip_address != '' AND msg_date <= " . $time ) );
 
-		foreach ( Application::allExtensions( 'core', 'pruneIpAddresses', FALSE, 'core' ) as $key => $extension )
+		foreach ( Application::allExtensions( 'core', 'IpAddresses', FALSE, 'core' ) as $key => $extension )
 		{
-			$extension->pruneIpAddresses( $time );
+			if( method_exists( $extension, 'pruneIpAddresses' ) )
+			{
+				$extension->pruneIpAddresses( $time );
+			}
 		}
 	}