Merge remote-tracking branch 'origin/4.5' into 4.5-master-2015-02-24-17-24-05

Conflicts:
	CRM/Batch/Form/Entry.php
	CRM/Utils/PDF/Utils.php

diff --cc CRM/Batch/Form/Entry.php
index e058d7fdba937b4a6de81731ec22764ac6f43dee,185c5421a763a1940f93f5c5ac9029409a0dd4fb..ec48e66409a10a2228663069eb7c70eba07078c5
mode 100755,100644..100755
--- 1/CRM/Batch/Form/Entry.php
--- 2/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php

diff --cc CRM/Utils/PDF/Utils.php
index d6ad7bef57a7949ec978dd6f9ca8c54569bfaba4,52a17dcd2c2441dd971ed6b9f5b8fb4ec4443c9d..90f36cecdfbe3e07f98142ca7396da8ac75e2e09
--- 1/CRM/Utils/PDF/Utils.php
--- 2/CRM/Utils/PDF/Utils.php
+++ b/CRM/Utils/PDF/Utils.php
@@@ -189,9 -178,12 +189,12 @@@ class CRM_Utils_PDF_Utils 
     *
     * @return string
     */
 -  static function _html2pdf_dompdf($paper_size, $orientation, $html, $output, $fileName) {
 +  public static function _html2pdf_dompdf($paper_size, $orientation, $html, $output, $fileName) {
-     require_once 'packages/dompdf/dompdf_config.inc.php';
-     spl_autoload_register('DOMPDF_autoload');
+     // CRM-12165 - Remote file support required for image handling.
+     define("DOMPDF_ENABLE_REMOTE", true);
+     define('DOMPDF_ENABLE_AUTOLOAD', false);
+     require_once 'packages/vendor/dompdf/dompdf/dompdf_config.inc.php';
+ 
      $dompdf = new DOMPDF();
      $dompdf->set_paper($paper_size, $orientation);
      $dompdf->load_html($html);

diff --cc templates/CRM/Batch/Form/Entry.tpl
index 2eeb718401df65c86492531621606851cfe2c70d,905851fdaf16c199f6eaaa80f79071f3638add8e..1d3617829aed0e50f9a90b3744768a816717c704
mode 100755,100644..100755
--- 1/templates/CRM/Batch/Form/Entry.tpl
--- 2/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@@ -125,25 -112,19 +125,33 @@@ CRM.$(function($) 
    $('.selector-rows').change(function () {
      var options = {
        'url': {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
 -    };
 -
 +    }; 
      $($form).ajaxSubmit(options);
    });
 + 
 + cj('input[id*="primary_contact_"]').change(function() {
 + var temp = this.id.split('_');
 +   var ROWID = temp[3];
 +   if (cj(this).val()) {
 +     updateContactInfo(ROWID,'primary_');
 +   }
 + });
 +
 + cj('select[id^="option_type_"]').each(function () {
 +    if (cj(this).val() == 1) {
 +      cj(this).attr('disabled', true);
 +      cj(this).hide();
 +    }
 +  });
  
+   cj('input[id*="primary_contact_id_"]').change(function() {
+     var temp = this.id.split('_');
+     var ROWID = temp[3];
+     if (cj(this).val()) {
+       updateContactInfo(ROWID,'primary_');
+     }
+   });
+ 
    $('#crm-container').on('keyup change', '*.selector-rows', function () {
      // validate rows
      checkColumns($(this));