Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8093)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8095)
@@ -89,5 +89,5 @@
 			
 			// Rechnungen im Dateisystem löschen
-			$path = $this->getFilePath($order_id); wpsg_rrmdir($path);
+			$path = $this->FilePath($order_id); wpsg_rrmdir($path);
 			
 		} // public function delOrder($order_id)
@@ -510,5 +510,11 @@
 				
 			 	$this->doDownload($_REQUEST['r_id']);
-
+<<<<<<< .mine
+			} else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'getMultiRechnung') {
+		
+				\check_admin_referer('wpsg-mod_invoice-order_ajax-getMultiRechnung-'.wpsg_getInt($_REQUEST['r_id']));
+			
+				$this->doDownload($_REQUEST['r_id']);
+=======
 			} 
 			else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'getMultiRechnung') {
@@ -517,5 +523,5 @@
 			
 				$this->doDownload($_REQUEST['r_id']);
-								
+>>>>>>> .theirs								
 			}
 			else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'storno') {