CRM-17789 - CRM_Core_Form, CRM_Report_Form - Fix visibility of _options, _action

There are a handful of places in the core codebase which pass
around the `$form` and access `_action` or `_options`. This
is pretty suspicious ... and invalid ...

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index f85032dd29f0addfa8bf392d488344920fb2171c..b8b35afdf86a0978d9ae059b6369011d0685d2ac 100644 (file)
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -67,16 +67,24 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
   public $_defaults = array();
 
   /**
-   * The options passed into this form
+   * (QUASI-PROTECTED) The options passed into this form
+   *
+   * This field should marked `protected` and is not generally
+   * intended for external callers, but some edge-cases do use it.
+   *
    * @var mixed
    */
-  protected $_options = NULL;
+  public $_options = NULL;
 
   /**
-   * The mode of operation for this form
+   * (QUASI-PROTECTED) The mode of operation for this form
+   *
+   * This field should marked `protected` and is not generally
+   * intended for external callers, but some edge-cases do use it.
+   *
    * @var int
    */
-  protected $_action;
+  public $_action;
 
   /**
    * Available payment processors.

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index ccbaea07be552c104879a2e478fa419b4212de8a..a4838d4f9bbb216cc76d28dd5809f077acbfd622 100644 (file)
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -88,7 +88,7 @@ class CRM_Report_Form extends CRM_Core_Form {
    *
    * @var array
    */
-  protected $_options = array();
+  public $_options = array();
 
   /**
    * By default most reports hide contact id.