From: kurund <kurund@civicrm.org>
Date: Mon, 26 Jan 2015 09:07:58 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=709e574bfc8b047d9e9f9a6ad84595bc3f560b54;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00

Conflicts:
	CRM/Contact/Page/ImageFile.php
	CRM/Contribute/Form/SoftCredit.php
	CRM/Event/Form/ManageEvent/Registration.php
---

709e574bfc8b047d9e9f9a6ad84595bc3f560b54
diff --cc CRM/Contact/Page/ImageFile.php
index 9c82b100a4,7e5a59a61b..86f3608c57
--- a/CRM/Contact/Page/ImageFile.php
+++ b/CRM/Contact/Page/ImageFile.php
@@@ -33,7 -33,15 +33,14 @@@
   *
   */
  class CRM_Contact_Page_ImageFile extends CRM_Core_Page {
 -
+   /**
+    * @var int Time to live (seconds).
+    *
+    * 12 hours: 12 * 60 * 60 = 43200
+    */
+   private $ttl = 43200;
+ 
 -  function run() {
 +  public function run() {
      if (!preg_match('/^[^\/]+\.(jpg|jpeg|png|gif)$/i', $_GET['photo'])) {
        CRM_Core_Error::fatal('Malformed photo name');
      }
diff --cc CRM/Event/Form/ManageEvent/Registration.php
index 38e53be47e,ee6cecba0c..bd434e9a05
--- a/CRM/Event/Form/ManageEvent/Registration.php
+++ b/CRM/Event/Form/ManageEvent/Registration.php
@@@ -722,12 -730,13 +722,10 @@@ class CRM_Event_Form_ManageEvent_Regist
     *
     * @param $profileIds
     * @param int $rgId
 -   * @return boolean
 +   * @return bool
     */
 -
    public static function canProfilesDedupe($profileIds, $rgId = 0) {
--
      // find the unsupervised rule
--
      $rgParams = array(
        'used' => 'Unsupervised',
        'contact_type' => 'Individual',