Merge pull request #4691 from webaccess/pledge-batchentry

[civicrm-core.git] / CRM / Contact / Page / View.php

diff --git a/CRM/Contact/Page/View.php b/CRM/Contact/Page/View.php
index d3be2d9b3df71a5666c48580fd5294efe1a72c7d..65619f6bb2cd21b38f00b071f2c8cd704cd7bdd1 100644 (file)
--- a/CRM/Contact/Page/View.php
+++ b/CRM/Contact/Page/View.php
@@ -40,7 +40,7 @@
 class CRM_Contact_Page_View extends CRM_Core_Page {
 
   /**
-   * the id of the object being viewed (note/relationship etc)
+   * The id of the object being viewed (note/relationship etc)
    *
    * @int
    * @access protected
@@ -48,7 +48,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page {
   protected $_id;
 
   /**
-   * the contact id of the contact being viewed
+   * The contact id of the contact being viewed
    *
    * @int
    * @access protected
@@ -167,7 +167,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page {
         $image_URL = str_replace('http://', 'https://', $image_URL);
       }
 
-      list($imageWidth, $imageHeight) = getimagesize($image_URL);
+      list($imageWidth, $imageHeight) = getimagesize(CRM_Utils_String::unstupifyUrl($image_URL));
       list($imageThumbWidth, $imageThumbHeight) = CRM_Contact_BAO_Contact::getThumbSize($imageWidth, $imageHeight);
       $this->assign("imageWidth", $imageWidth);
       $this->assign("imageHeight", $imageHeight);
@@ -259,7 +259,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page {
   /**
    * Get meta details of the contact.
    *
-   * @param $contactId
+   * @param int $contactId
    *
    * @return array contact fields in fixed order
    * @access public
@@ -278,7 +278,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page {
 
   /**
    * @param $page
-   * @param null $contactID
+   * @param int $contactID
    */
   static function checkUserPermission($page, $contactID = NULL) {
     // check for permissions
@@ -316,7 +316,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page {
   }
 
   /**
-   * @param $contactId
+   * @param int $contactId
    * @param bool $isDeleted
    *
    * @return string