diff --git a/modules/Portal/models/Module.php b/modules/Portal/models/Module.php index 517622b6a8dffb4d81263cf89b0f8ce3968e5757..7d8b888f4c70156b10a084afd390dea62360db61 100644 --- a/modules/Portal/models/Module.php +++ b/modules/Portal/models/Module.php @@ -21,7 +21,7 @@ class Portal_Module_Model extends Vtiger_Module_Model { return $links; } - public function saveRecord($recordId, $bookmarkName, $bookmarkUrl) { + public function saveRecord($recordId, $bookmarkName = false, $bookmarkUrl = false) { $db = PearDatabase::getInstance(); if(empty($recordId)) { $portalId = $db->getUniqueID('vtiger_portal'); diff --git a/modules/Settings/ModuleManager/models/Module.php b/modules/Settings/ModuleManager/models/Module.php index dce27bcce2267e8e27ce4dafacba3fc3c5c2afb4..10e48528a9af51d6b9f8ecb03c6c15eafa2ea7ca 100644 --- a/modules/Settings/ModuleManager/models/Module.php +++ b/modules/Settings/ModuleManager/models/Module.php @@ -66,8 +66,14 @@ class Settings_ModuleManager_Module_Model extends Vtiger_Module_Model { * Static Function to get the instance of Vtiger Module Model for all the modules * @return <Array> - List of Vtiger Module Model or sub class instances */ - public static function getAll() { - return parent::getAll(array(0,1), self::getNonVisibleModulesList()); + public static function getAll($presence = array(), $restrictedModulesList = array(),$sequenced = false) { + if(empty($presence)){ + $presence = array(0,1); + } + if(empty($restrictedModulesList)){ + $restrictedModulesList = self::getNonVisibleModulesList(); + } + return parent::getAll($presence, $restrictedModulesList); } /** diff --git a/modules/Vtiger/uitypes/Email.php b/modules/Vtiger/uitypes/Email.php index 7dbab62b85f2b6a8d3b2e672ba4b6ab21c24904a..31cd3dc60f6ff7fed6d452396e70000728dd28fe 100644 --- a/modules/Vtiger/uitypes/Email.php +++ b/modules/Vtiger/uitypes/Email.php @@ -18,7 +18,7 @@ class Vtiger_Email_UIType extends Vtiger_Base_UIType { return 'uitypes/Email.tpl'; } - public function getDisplayValue($value, $recordId, $recordInstance=false) { + public function getDisplayValue($value, $recordId = false, $recordInstance=false) { $currentUser = Users_Record_Model::getCurrentUserModel(); $internalMailer = $currentUser->get('internal_mailer'); if($value){ diff --git a/modules/Vtiger/uitypes/UserRole.php b/modules/Vtiger/uitypes/UserRole.php index 423e6ac74e718b663fdfd31971d99adc0440bc40..3d30d24fca78023b96fa561783cf2145ed8063f3 100644 --- a/modules/Vtiger/uitypes/UserRole.php +++ b/modules/Vtiger/uitypes/UserRole.php @@ -36,7 +36,7 @@ class Vtiger_UserRole_UIType extends Vtiger_Base_UIType { * @param <Number> $recordId * @return <String> display value */ - public function getDisplayValue($value, $recordId) { + public function getDisplayValue($value, $recordId=false, $recordInstance=false) { $displayValue = $this->getEditViewDisplayValue($value); $currentUserModel = Users_Record_Model::getCurrentUserModel(); if ($currentUserModel->isAdminUser()) {