Move towards allowing sending 500 http errors back by switching civiExit(1) to be...

diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php
index f8ad052bb40af5f1ef43a2ea474d0faf2879e306..961e178197da805716b45f9789589c1137f45f61 100644 (file)
--- 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 ed0943aa5b95fa40e4afa71ce5d3fc21c995ba9f..ec9f3274797311210b2c0a378b3dbb84032fb95e 100644 (file)
--- 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 de9251b49eba804a9018cd3a293f429533475cac..d0e9f156c23e889073ecd5e3abc1c13c6be1867b 100644 (file)
--- 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 f5fdb968c9a63490de6607418340fd1d21ef3aed..f8a9724e25d865b519e9e67628390903fd5c6e77 100644 (file)
--- 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 e073c568271e7b516cf4fdd95ca2462e19717bf1..925122adc113cc2e611647b5668b729d609e858b 100644 (file)
--- 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 494bfb8cc4222a29ce79f71bed0aabbf8326a565..3b40764aa032b2a2d253e40fb9cf6f5c5dfdad59 100644 (file)
--- 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 7ec3c55fff8a66d3024cbf6c99d816bcb72567b5..c1db72017091399e4dcf61f0e7f6a67e13ee8165 100644 (file)
--- 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 8e61de453fac538f59ba36b382e905640f930107..98c5343dafc2d73cac77f83693c83d8022f37194 100644 (file)
--- 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();
   }
 
   /**