From 2fd76d70d2159fb2c8236ebdee2e6c7f0a73d2bd Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Tue, 12 May 2020 20:49:13 +0530
Subject: [PATCH] Fixes #1283 Signature warnings are been addressed
---
modules/Calendar/uitypes/Datetime.php | 2 +-
modules/Documents/uitypes/Text.php | 2 +-
modules/Vtiger/uitypes/CurrencyList.php | 2 +-
modules/Vtiger/uitypes/DocumentsFolder.php | 2 +-
modules/Vtiger/uitypes/Double.php | 2 +-
modules/Vtiger/uitypes/FileLocationType.php | 2 +-
modules/Vtiger/uitypes/Multiowner.php | 2 +-
modules/Vtiger/uitypes/Multipicklist.php | 2 +-
modules/Vtiger/uitypes/Ownergroup.php | 2 +-
modules/Vtiger/uitypes/Reminder.php | 2 +-
modules/Vtiger/uitypes/Theme.php | 2 +-
modules/Vtiger/uitypes/Time.php | 2 +-
modules/Vtiger/uitypes/UserReference.php | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/Calendar/uitypes/Datetime.php b/modules/Calendar/uitypes/Datetime.php
index b45369c00..3b1c244e5 100644
--- a/modules/Calendar/uitypes/Datetime.php
+++ b/modules/Calendar/uitypes/Datetime.php
@@ -10,7 +10,7 @@
class Calendar_Datetime_UIType extends Vtiger_Datetime_UIType {
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
//Since date_start and due_date fields of calendar can have time appended or removed
if($this->hasTimeComponent($value)) {
return self::getDisplayDateTimeValue($value);
diff --git a/modules/Documents/uitypes/Text.php b/modules/Documents/uitypes/Text.php
index 03b8acbdc..753594179 100644
--- a/modules/Documents/uitypes/Text.php
+++ b/modules/Documents/uitypes/Text.php
@@ -15,7 +15,7 @@ class Documents_Text_UIType extends Vtiger_Text_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
return $value;
}
diff --git a/modules/Vtiger/uitypes/CurrencyList.php b/modules/Vtiger/uitypes/CurrencyList.php
index 1644b1699..87f4b4359 100644
--- a/modules/Vtiger/uitypes/CurrencyList.php
+++ b/modules/Vtiger/uitypes/CurrencyList.php
@@ -17,7 +17,7 @@ class Vtiger_CurrencyList_UIType extends Vtiger_Base_UIType {
return 'uitypes/CurrencyList.tpl';
}
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT currency_name FROM vtiger_currency_info WHERE currency_status = ? AND id = ?',
array('Active', $value));
diff --git a/modules/Vtiger/uitypes/DocumentsFolder.php b/modules/Vtiger/uitypes/DocumentsFolder.php
index c1cf8c645..477d5720f 100644
--- a/modules/Vtiger/uitypes/DocumentsFolder.php
+++ b/modules/Vtiger/uitypes/DocumentsFolder.php
@@ -23,7 +23,7 @@ class Vtiger_DocumentsFolder_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT * FROM vtiger_attachmentsfolder WHERE folderid = ?', array($value));
if($db->num_rows($result)) {
diff --git a/modules/Vtiger/uitypes/Double.php b/modules/Vtiger/uitypes/Double.php
index 7d9df554d..d53b532b2 100644
--- a/modules/Vtiger/uitypes/Double.php
+++ b/modules/Vtiger/uitypes/Double.php
@@ -23,7 +23,7 @@ class Vtiger_Double_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
return decimalFormat($value);
}
diff --git a/modules/Vtiger/uitypes/FileLocationType.php b/modules/Vtiger/uitypes/FileLocationType.php
index 0f392c982..7d336d5bb 100644
--- a/modules/Vtiger/uitypes/FileLocationType.php
+++ b/modules/Vtiger/uitypes/FileLocationType.php
@@ -23,7 +23,7 @@ class Vtiger_FileLocationType_UIType extends Vtiger_Base_UIType {
* @param <String> value of field
* @return <String> Converted value
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
if ($value === 'I') {
$value = 'LBL_INTERNAL';
} else {
diff --git a/modules/Vtiger/uitypes/Multiowner.php b/modules/Vtiger/uitypes/Multiowner.php
index 110579159..a32f3ddc6 100755
--- a/modules/Vtiger/uitypes/Multiowner.php
+++ b/modules/Vtiger/uitypes/Multiowner.php
@@ -23,7 +23,7 @@ class Vtiger_Multiowner_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($values) {
+ public function getDisplayValue($values, $record=false, $recordInstance=false) {
if($values == NULL && !is_array($values)) return;
foreach($values as $value){
if (self::getOwnerType($value) === 'User') {
diff --git a/modules/Vtiger/uitypes/Multipicklist.php b/modules/Vtiger/uitypes/Multipicklist.php
index 83b4527c2..f342a0f38 100644
--- a/modules/Vtiger/uitypes/Multipicklist.php
+++ b/modules/Vtiger/uitypes/Multipicklist.php
@@ -23,7 +23,7 @@ class Vtiger_Multipicklist_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$moduleName = $this->get('field')->getModuleName();
$value = explode(' |##| ', $value);
diff --git a/modules/Vtiger/uitypes/Ownergroup.php b/modules/Vtiger/uitypes/Ownergroup.php
index a20dffb49..c343c8833 100644
--- a/modules/Vtiger/uitypes/Ownergroup.php
+++ b/modules/Vtiger/uitypes/Ownergroup.php
@@ -23,7 +23,7 @@ class Vtiger_Ownergroup_UIType extends Vtiger_Owner_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$recordModel = new Settings_Groups_Record_Model();
$recordModel->set('groupid', $value);
$detailViewUrl = $recordModel->getDetailViewUrl();
diff --git a/modules/Vtiger/uitypes/Reminder.php b/modules/Vtiger/uitypes/Reminder.php
index c98fb4794..033d14e1e 100644
--- a/modules/Vtiger/uitypes/Reminder.php
+++ b/modules/Vtiger/uitypes/Reminder.php
@@ -31,7 +31,7 @@ class Vtiger_Reminder_UIType extends Vtiger_Date_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$reminder_value = '';
$reminder_time = $this->getEditViewDisplayValue($value);
if(!empty($reminder_time[0])){
diff --git a/modules/Vtiger/uitypes/Theme.php b/modules/Vtiger/uitypes/Theme.php
index 53d971bd1..e3ed9ea7a 100644
--- a/modules/Vtiger/uitypes/Theme.php
+++ b/modules/Vtiger/uitypes/Theme.php
@@ -23,7 +23,7 @@ class Vtiger_Theme_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return <Object>
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$allSkins = Vtiger_Theme::getAllSkins();
$skinColor = $allSkins[$value];
$value = ucfirst($value);
diff --git a/modules/Vtiger/uitypes/Time.php b/modules/Vtiger/uitypes/Time.php
index 1f59d8156..e5c0054d6 100644
--- a/modules/Vtiger/uitypes/Time.php
+++ b/modules/Vtiger/uitypes/Time.php
@@ -90,7 +90,7 @@ class Vtiger_Time_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return $value
*/
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $recordId = false, $recordInstance=false) {
$userModel = Users_Privileges_Model::getCurrentUserModel();
if($userModel->get('hour_format') == '12'){
return self::getTimeValueInAMorPM($value);
diff --git a/modules/Vtiger/uitypes/UserReference.php b/modules/Vtiger/uitypes/UserReference.php
index 7c050dee7..0404b7ee0 100644
--- a/modules/Vtiger/uitypes/UserReference.php
+++ b/modules/Vtiger/uitypes/UserReference.php
@@ -36,7 +36,7 @@ class Vtiger_UserReference_UIType extends Vtiger_Base_UIType {
* @param <Number> $recordId
* @return <String> display value
*/
- public function getDisplayValue($value, $recordId) {
+ public function getDisplayValue($value, $record=false, $recordInstance=false) {
$displayValue = $this->getEditViewDisplayValue($value);
$currentUserModel = Users_Record_Model::getCurrentUserModel();
if ($currentUserModel->isAdminUser()) {
--
GitLab