diff --git a/modules/Users/models/Record.php b/modules/Users/models/Record.php index 6f97b8683a93af086395be540933538b237e638d..1cc0d3633b1564d82d90f096ff7bc65525cb2a13 100644 --- a/modules/Users/models/Record.php +++ b/modules/Users/models/Record.php @@ -398,7 +398,8 @@ class Users_Record_Model extends Vtiger_Record_Model { $url = \Vtiger_Functions::getFilePublicURL($imageId, $imageName); //decode_html - added to handle UTF-8 characters in file names - $imageOriginalName = urlencode(decode_html($imageName)); + $imageNameDecoded =decode_html($imageName); + $imageOriginalName = urlencode($imageNameDecoded ? $imageNameDecoded : ""); if($url) { $url = $site_URL.$url; } diff --git a/modules/Vtiger/models/MenuStructure.php b/modules/Vtiger/models/MenuStructure.php index c0d111dcde91ba9387198b11cee030cc7a5a3481..7c1fb86390e901536eb1c535e322dedafd5ecd27 100644 --- a/modules/Vtiger/models/MenuStructure.php +++ b/modules/Vtiger/models/MenuStructure.php @@ -87,7 +87,7 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model { $currentTopMenuCount++; } - $parent = ucfirst(strtolower($menuModel->get('parent'))); + $parent = ucfirst(strtolower($menuModel->get('parent') ? $menuModel->get('parent') : "")); if($parent == 'Sales' || $parent == 'Marketing'){ $parent = 'MARKETING_AND_SALES'; } diff --git a/modules/com_vtiger_workflow/VTEntityCache.inc b/modules/com_vtiger_workflow/VTEntityCache.inc index fedab9844148453d5536ec7c8cbe67ed5a6db470..15d24c6e93aeae5caf4da88bfe5efa9f322d7dc5 100644 --- a/modules/com_vtiger_workflow/VTEntityCache.inc +++ b/modules/com_vtiger_workflow/VTEntityCache.inc @@ -120,6 +120,9 @@ class VTWorkflowEntity{ } class VTEntityCache{ + var $user; + var $cache; + function __construct($user){ $this->user = $user; $this->cache = array(); diff --git a/modules/com_vtiger_workflow/VTEntityMethodManager.inc b/modules/com_vtiger_workflow/VTEntityMethodManager.inc index acede1790c8c4fffd127408fc0dbdfcc789c2e10..281c75d716cb457a594583c0c06f8906f3771f97 100644 --- a/modules/com_vtiger_workflow/VTEntityMethodManager.inc +++ b/modules/com_vtiger_workflow/VTEntityMethodManager.inc @@ -9,6 +9,7 @@ ******************************************************************************/ require_once("include/events/SqlResultIterator.inc"); class VTEntityMethodManager{ + var $adb; function __construct($adb){ $this->adb = $adb; diff --git a/modules/com_vtiger_workflow/VTEventHandler.inc b/modules/com_vtiger_workflow/VTEventHandler.inc index 4bcdbfa7f4c6ff8c460ac1a317e3fa89b4cd4bb0..4c251407abcc911457bf7def98f02cbdf7c992b8 100644 --- a/modules/com_vtiger_workflow/VTEventHandler.inc +++ b/modules/com_vtiger_workflow/VTEventHandler.inc @@ -31,6 +31,7 @@ require_once('VTWorkflowUtils.php'); */ class VTWorkflowEventHandler extends VTEventHandler { + var $workflows; /** * Push tasks to the task queue if the conditions are true diff --git a/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php b/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php index 4aa3ae89cb71dbd8c85debffc333908e7f99c0f8..11b2bc284ca109b73a7366c05754a3abcbf65a8c 100644 --- a/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php +++ b/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php @@ -163,7 +163,7 @@ class Settings_ExtensionStore_ExtnStore_Connector { /** * Function to get max created on for promotions */ - public function getMaxCreatedOn($type = 'Extension', $function, $field) { + public function getMaxCreatedOn($type = 'Extension', $function = null, $field = null) { $q = array('type' => $type); try { $response = $this->api('/app/listings', 'GET', $q ? array('q' => Zend_Json::encode($q), 'fn' => $function, 'max' => $field) : null, false); diff --git a/pkg/vtiger/modules/ExtensionStore/settings/models/Extension.php b/pkg/vtiger/modules/ExtensionStore/settings/models/Extension.php index b7ac2319dbdaa0a38beeaf0fe152b51f85cb9059..7b1e4dfec3c1b65fcc159e90238b18b2aa25e8d2 100644 --- a/pkg/vtiger/modules/ExtensionStore/settings/models/Extension.php +++ b/pkg/vtiger/modules/ExtensionStore/settings/models/Extension.php @@ -204,7 +204,7 @@ class Settings_ExtensionStore_Extension_Model extends Vtiger_Base_Model { /** * Function to get max created on promotion */ - public function getMaxCreatedOn($type = 'Extension', $function, $field) { + public function getMaxCreatedOn($type = 'Extension', $function = null, $field = null) { $connector = $this->getConnector(); if ($connector) { $listings = $connector->getMaxCreatedOn($type, $function, $field); @@ -297,7 +297,7 @@ class Settings_ExtensionStore_Extension_Model extends Vtiger_Base_Model { * @param <String> search term * @return <Array> list of extensions <Settings_ExtensionStore_Extension_Model> */ - public function findListings($searchTerm = null, $searchType) { + public function findListings($searchTerm = null, $searchType = null) { $extensionModelsList = array(); $connector = $this->getConnector(); if ($connector) {