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

diff --cc CRM/Contact/Page/ImageFile.php
index 9c82b100a46ff6643826c5fabe9d1e53ae34a372,7e5a59a61b9243dde34daf480bfff6a6a7fddd06..86f3608c57ec07b0a76e766efa9a5fff7d93ebdf
--- 1/CRM/Contact/Page/ImageFile.php
--- 2/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 38e53be47eb13255e1bfb29b9ae392e46d63c08c,ee6cecba0c1339dff8c238868e033b75a2c568b5..bd434e9a050581c20397dae0a0064a4ce3de9daa
--- 1/CRM/Event/Form/ManageEvent/Registration.php
--- 2/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',