Merge pull request #10087 from lcdservices/CRM-20368

CRM-20368

diff --cc CRM/Report/Form/Contact/Relationship.php
Simple merge

diff --cc CRM/Report/Form/Mailing/Summary.php
index 9e0bb2cc9025c4678443706c25f6b89df2b8add2,55adaa27cecb427403472d583c7550c31e0d70e5..0431502b1db219d44ad0616f1edd82ac3179841d
--- 1/CRM/Report/Form/Mailing/Summary.php
--- 2/CRM/Report/Form/Mailing/Summary.php
+++ b/CRM/Report/Form/Mailing/Summary.php
@@@ -93,13 -93,17 +93,23 @@@ class CRM_Report_Form_Mailing_Summary e
            'options' => self::mailing_select(),
            'operator' => 'like',
          ),
 +        'mailing_subject' => array(
 +          'name' => 'subject',
 +          'title' => ts('Mailing Subject'),
 +          'type' => CRM_Utils_Type::T_STRING,
 +          'operator' => 'like',
 +        ),
        ),
+       'order_bys' => array(
+         'mailing_name' => array(
+           'name' => 'name',
+           'title' => ts('Mailing Name'),
+         ),
+         'mailing_subject' => array(
+           'name' => 'subject',
+           'title' => ts('Mailing Subject'),
+         ),
+       ),
      );
  
      $this->_columns['civicrm_mailing_job'] = array(