Version 3.4.5

upload/admin/applications/forums/tasks/permadelete.php

@@ -4,11 +4,11 @@
  *~TERABYTE_DOC_READY~
  * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
  * $License: http://www.invisionpower.com/company/standards.php#license$
- * $Author: AndyMillne $
+ * $Author: bfarber $
  * @since		-
- * $LastChangedDate: 2012-07-02 10:20:47 -0400 (Mon, 02 Jul 2012) $
- * @version		v3.3.4
- * $Revision: 11019 $
+ * $LastChangedDate: 2013-01-18 23:06:49 -0500 (Fri, 18 Jan 2013) $
+ * @version		v3.4.5
+ * $Revision: 11873 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -106,7 +106,7 @@ class task_item
 		
 		$this->DB->build( array( 'select' => '*',
 								 'from'   => 'topics',
-								 'where'  => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'pdelete', 'oktoremove' ) ) . ' AND tdelete_time < ' . $_ts,
+								 'where'  => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'pdelete', 'oktoremove' ) ) . ' AND tdelete_time < ' . $_ts . ' AND ' . $this->registry->getClass('class_forums')->fetchTopicArchiveQuery( array( 'not', 'exclude' ) ),
 								 'limit'  => array( 0, 500 ) ) );
 								 
 		$outer	= $this->DB->execute();
@@ -175,7 +175,10 @@ class task_item
 			$this->cache->rebuildCache( 'stats', 'global' );
 		}
 		
-		$moderatorLibrary->addModerateLog( "", "", "", implode( ',', $_ids ), sprintf( $this->lang->words['multi_post_delete'], implode( ', ', $_ids ) ) );
+		if( count($_ids) )
+		{
+			$moderatorLibrary->addModerateLog( "", "", "", implode( ',', $_ids ), sprintf( $this->lang->words['multi_post_delete'], implode( ', ', $_ids ) ) );
+		}
 		
 		//-----------------------------------------
 		// Log to log table - modify but dont delete