projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-15495 - Improve entityRef contact_type filter
[civicrm-core.git]
/
CRM
/
Contact
/
Page
/
View.php
diff --git
a/CRM/Contact/Page/View.php
b/CRM/Contact/Page/View.php
index 2ebe283cb0edbed40f8c6790b0369a6a334c6f9a..35a8f5be87a59a6e6aac55808a4434aca79df9ec 100644
(file)
--- a/
CRM/Contact/Page/View.php
+++ b/
CRM/Contact/Page/View.php
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
5
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
@@
-40,18
+40,16
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
/**
class CRM_Contact_Page_View extends CRM_Core_Page {
/**
- *
t
he id of the object being viewed (note/relationship etc)
+ *
T
he id of the object being viewed (note/relationship etc)
*
* @int
*
* @int
- * @access protected
*/
protected $_id;
/**
*/
protected $_id;
/**
- *
t
he contact id of the contact being viewed
+ *
T
he contact id of the contact being viewed
*
* @int
*
* @int
- * @access protected
*/
protected $_contactId;
*/
protected $_contactId;
@@
-59,7
+57,6
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
* The action that we are performing
*
* @string
* The action that we are performing
*
* @string
- * @access protected
*/
protected $_action;
*/
protected $_action;
@@
-67,7
+64,6
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
* The permission we have on this contact
*
* @string
* The permission we have on this contact
*
* @string
- * @access protected
*/
protected $_permission;
*/
protected $_permission;
@@
-76,10
+72,9
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
* the contact and calls the appropriate type of page to view.
*
* @return void
* the contact and calls the appropriate type of page to view.
*
* @return void
- * @access public
*
*/
*
*/
- function preProcess() {
+
public
function preProcess() {
// process url params
$this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
$this->assign('id', $this->_id);
// process url params
$this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
$this->assign('id', $this->_id);
@@
-259,12
+254,11
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
/**
* Get meta details of the contact.
*
/**
* Get meta details of the contact.
*
- * @param $contactId
+ * @param
int
$contactId
*
* @return array contact fields in fixed order
*
* @return array contact fields in fixed order
- * @access public
*/
*/
- static function getContactDetails($contactId) {
+
public
static function getContactDetails($contactId) {
return list($displayName,
$contactImage,
$contactType,
return list($displayName,
$contactImage,
$contactType,
@@
-278,9
+272,9
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
/**
* @param $page
/**
* @param $page
- * @param
null
$contactID
+ * @param
int
$contactID
*/
*/
- static function checkUserPermission($page, $contactID = NULL) {
+
public
static function checkUserPermission($page, $contactID = NULL) {
// check for permissions
$page->_permission = NULL;
// check for permissions
$page->_permission = NULL;
@@
-316,12
+310,12
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
}
/**
}
/**
- * @param $contactId
+ * @param
int
$contactId
* @param bool $isDeleted
*
* @return string
*/
* @param bool $isDeleted
*
* @return string
*/
- static function setTitle($contactId, $isDeleted = FALSE) {
+
public
static function setTitle($contactId, $isDeleted = FALSE) {
static $contactDetails;
$displayName = $contactImage = NULL;
if (!isset($contactDetails[$contactId])) {
static $contactDetails;
$displayName = $contactImage = NULL;
if (!isset($contactDetails[$contactId])) {
@@
-353,7
+347,7
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
* @param CRM_Core_Page $obj
* @param integer $cid
*/
* @param CRM_Core_Page $obj
* @param integer $cid
*/
- static function addUrls(&$obj, $cid) {
+
public
static function addUrls(&$obj, $cid) {
$uid = CRM_Core_BAO_UFMatch::getUFId($cid);
if ($uid) {
$uid = CRM_Core_BAO_UFMatch::getUFId($cid);
if ($uid) {
@@
-387,4
+381,3
@@
class CRM_Contact_Page_View extends CRM_Core_Page {
}
}
}
}
}
}
-