From 292c86878d20b365ebdd5471aee1a8446a8049ae Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 8 Oct 2018 21:33:08 +1100
Subject: [PATCH] Move towards allowing sending 500 http errors back by
 switching civiExit(1) to be just civiExit()

---
 CRM/Badge/BAO/Badge.php                      | 2 +-
 CRM/Contact/Form/Task/Label.php              | 2 +-
 CRM/Contact/Form/Task/PDFLetterCommon.php    | 2 +-
 CRM/Contribute/Form/Task/PDFLetterCommon.php | 2 +-
 CRM/Event/Badge.php                          | 2 +-
 CRM/Member/Form/Task/Label.php               | 2 +-
 CRM/Member/Form/Task/PDFLetterCommon.php     | 2 +-
 CRM/Utils/PDF/Utils.php                      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php
index f8ad052bb4..961e178197 100644
--- a/CRM/Badge/BAO/Badge.php
+++ b/CRM/Badge/BAO/Badge.php
@@ -73,7 +73,7 @@ class CRM_Badge_BAO_Badge {
     }
 
     $this->pdf->Output(CRM_Utils_String::munge($layoutInfo['title'], '_', 64) . '.pdf', 'D');
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
   /**
diff --git a/CRM/Contact/Form/Task/Label.php b/CRM/Contact/Form/Task/Label.php
index ed0943aa5b..ec9f327479 100644
--- a/CRM/Contact/Form/Task/Label.php
+++ b/CRM/Contact/Form/Task/Label.php
@@ -351,7 +351,7 @@ class CRM_Contact_Form_Task_Label extends CRM_Contact_Form_Task {
 
     //call function to create labels
     self::createLabel($rows, $fv['label_name']);
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
   /**
diff --git a/CRM/Contact/Form/Task/PDFLetterCommon.php b/CRM/Contact/Form/Task/PDFLetterCommon.php
index de9251b49e..d0e9f156c2 100644
--- a/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -465,7 +465,7 @@ class CRM_Contact_Form_Task_PDFLetterCommon {
 
     $form->postProcessHook();
 
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
   /**
diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index f5fdb968c9..f8a9724e25 100644
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -156,7 +156,7 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
     }
     if (!empty($html)) {
       // ie. we have only sent emails - lets no show a white screen
-      CRM_Utils_System::civiExit(1);
+      CRM_Utils_System::civiExit();
     }
   }
 
diff --git a/CRM/Event/Badge.php b/CRM/Event/Badge.php
index e073c56827..925122adc1 100644
--- a/CRM/Event/Badge.php
+++ b/CRM/Event/Badge.php
@@ -88,7 +88,7 @@ class CRM_Event_Badge {
     $this->event = self::retrieveEvent($eventID);
     //call function to create labels
     self::createLabels($participants);
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
   /**
diff --git a/CRM/Member/Form/Task/Label.php b/CRM/Member/Form/Task/Label.php
index 494bfb8cc4..3b40764aa0 100644
--- a/CRM/Member/Form/Task/Label.php
+++ b/CRM/Member/Form/Task/Label.php
@@ -142,7 +142,7 @@ class CRM_Member_Form_Task_Label extends CRM_Member_Form_Task {
     }
     //call function to create labels
     CRM_Contact_Form_Task_LabelCommon::createLabel($labelRows, $labelName);
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
 }
diff --git a/CRM/Member/Form/Task/PDFLetterCommon.php b/CRM/Member/Form/Task/PDFLetterCommon.php
index 7ec3c55fff..c1db720170 100644
--- a/CRM/Member/Form/Task/PDFLetterCommon.php
+++ b/CRM/Member/Form/Task/PDFLetterCommon.php
@@ -37,7 +37,7 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
 
     $form->postProcessHook();
 
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
   /**
diff --git a/CRM/Utils/PDF/Utils.php b/CRM/Utils/PDF/Utils.php
index 8e61de453f..98c5343daf 100644
--- a/CRM/Utils/PDF/Utils.php
+++ b/CRM/Utils/PDF/Utils.php
@@ -189,7 +189,7 @@ class CRM_Utils_PDF_Utils {
     $pdf->Close();
     $pdf_file = 'CiviLetter' . '.pdf';
     $pdf->Output($pdf_file, 'D');
-    CRM_Utils_System::civiExit(1);
+    CRM_Utils_System::civiExit();
   }
 
   /**
-- 
2.25.1