Remove unused parameter, pass-by-ref

diff --git a/CRM/Contact/Form/Inline/Email.php b/CRM/Contact/Form/Inline/Email.php
index 3b591748265527917e0d36b6a749ded772daa331..78ca2fbb5bb144c35941f19620c1e79e0604460d 100644 (file)
--- a/CRM/Contact/Form/Inline/Email.php
+++ b/CRM/Contact/Form/Inline/Email.php
@@ -49,7 +49,7 @@ class CRM_Contact_Form_Inline_Email extends CRM_Contact_Form_Inline {
     $email = new CRM_Core_BAO_Email();
     $email->contact_id = $this->_contactId;
 
-    $this->_emails = CRM_Core_BAO_Block::retrieveBlock($email, NULL);
+    $this->_emails = CRM_Core_BAO_Block::retrieveBlock($email);
 
     // Check if this contact has a first/last/organization/household name
     if ($this->_contactType == 'Individual') {

diff --git a/CRM/Contact/Form/Inline/IM.php b/CRM/Contact/Form/Inline/IM.php
index 4ab5fd953171c39b8be480116c9e3a7e73641f36..bf0fb219dd1fc19f1a64d63929b255a856e3b40a 100644 (file)
--- a/CRM/Contact/Form/Inline/IM.php
+++ b/CRM/Contact/Form/Inline/IM.php
@@ -42,7 +42,7 @@ class CRM_Contact_Form_Inline_IM extends CRM_Contact_Form_Inline {
     $im = new CRM_Core_BAO_IM();
     $im->contact_id = $this->_contactId;
 
-    $this->_ims = CRM_Core_BAO_Block::retrieveBlock($im, NULL);
+    $this->_ims = CRM_Core_BAO_Block::retrieveBlock($im);
   }
 
   /**

diff --git a/CRM/Contact/Form/Inline/OpenID.php b/CRM/Contact/Form/Inline/OpenID.php
index 1f60b8db23b07aa60f166481dbe00af367f12fa9..330bc520eb3495d7c8303e3023c54d6ad0a9ea92 100644 (file)
--- a/CRM/Contact/Form/Inline/OpenID.php
+++ b/CRM/Contact/Form/Inline/OpenID.php
@@ -42,7 +42,7 @@ class CRM_Contact_Form_Inline_OpenID extends CRM_Contact_Form_Inline {
     $openid = new CRM_Core_BAO_OpenID();
     $openid->contact_id = $this->_contactId;
 
-    $this->_openids = CRM_Core_BAO_Block::retrieveBlock($openid, NULL);
+    $this->_openids = CRM_Core_BAO_Block::retrieveBlock($openid);
   }
 
   /**

diff --git a/CRM/Contact/Form/Inline/Phone.php b/CRM/Contact/Form/Inline/Phone.php
index 3ca3255a7126f9ecddd3da1ac59fcfdc3db4c678..ff48187dfb9af7b70a912b8f0fcdaf54ad114278 100644 (file)
--- a/CRM/Contact/Form/Inline/Phone.php
+++ b/CRM/Contact/Form/Inline/Phone.php
@@ -42,7 +42,7 @@ class CRM_Contact_Form_Inline_Phone extends CRM_Contact_Form_Inline {
     $phone = new CRM_Core_BAO_Phone();
     $phone->contact_id = $this->_contactId;
 
-    $this->_phones = CRM_Core_BAO_Block::retrieveBlock($phone, NULL);
+    $this->_phones = CRM_Core_BAO_Block::retrieveBlock($phone);
   }
 
   /**

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 4929e323fd37141cece4b32cf2aa3c090d070666..190ca1dad1ff573fc89799a92db2a67d115a86d5 100644 (file)
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -54,7 +54,7 @@ class CRM_Core_BAO_Block {
       if (!$block->contact_id) {
         throw new CRM_Core_Exception('Invalid Contact ID parameter passed');
       }
-      $blocks = self::retrieveBlock($block, $blockName);
+      $blocks = self::retrieveBlock($block);
     }
     else {
       $blockIds = self::getBlockIds($blockName, NULL, $params);
@@ -67,7 +67,7 @@ class CRM_Core_BAO_Block {
       foreach ($blockIds as $blockId) {
         $block = new $BAOString();
         $block->id = $blockId['id'];
-        $getBlocks = self::retrieveBlock($block, $blockName);
+        $getBlocks = self::retrieveBlock($block);
         $blocks[$count++] = array_pop($getBlocks);
       }
     }
@@ -81,13 +81,11 @@ class CRM_Core_BAO_Block {
    *
    * @param Object $block
    *   Typically a Phone|Email|IM|OpenID object.
-   * @param string $blockName
-   *   Name of the above object.
    *
    * @return array
    *   Array of $block objects.
    */
-  public static function retrieveBlock(&$block, $blockName) {
+  public static function retrieveBlock($block) {
     // we first get the primary location due to the order by clause
     $block->orderBy('is_primary desc, id');
     $block->find();